]> git.saurik.com Git - cycript.git/blobdiff - Makefile.in
Fix pointer crashes and round-trip const void *.
[cycript.git] / Makefile.in
index b5b6e888734d4b06a4474c42fdd0240c88695f23..ac610b93378d3e34f4bbe62e8075e9e65b0b9e0c 100644 (file)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -98,21 +98,22 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@CY_MACH_TRUE@am__append_1 = libcycript-any.la
 @CY_CONSOLE_TRUE@bin_PROGRAMS = cycript$(EXEEXT)
-@CY_EXECUTE_TRUE@am__append_1 = sig/ffi_type.cpp sig/parse.cpp \
+@CY_EXECUTE_TRUE@am__append_2 = sig/ffi_type.cpp sig/parse.cpp \
 @CY_EXECUTE_TRUE@      sig/copy.cpp Bridge.cpp Execute.cpp \
-@CY_EXECUTE_TRUE@      JavaScriptCore.cpp Library.cpp
-@CY_EXECUTE_TRUE@am__append_2 = $(LTJAVASCRIPTCORE)
-@CY_EXECUTE_TRUE@am__append_3 = -DCY_EXECUTE
-@CY_EXECUTE_TRUE@am__append_4 = C
-@CY_EXECUTE_TRUE@am__append_5 = Bridge.gperf Bridge.hpp
-@CY_OBJECTIVEC_TRUE@am__append_6 = ObjectiveC
-@CY_OBJECTIVEC_TRUE@am__append_7 = ObjectiveC/Output.cpp ObjectiveC/Replace.cpp ObjectiveC/Library.mm
-@CY_OBJECTIVEC_TRUE@am__append_8 = $(LTOBJECTIVEC)
-@CY_MACH_TRUE@am__append_9 = Handler.mm
-@CY_CONSOLE_TRUE@@CY_MACH_TRUE@am__append_10 = Mach/Inject.cpp
-@CY_CONSOLE_TRUE@@CY_MACH_TRUE@am__append_11 = -DCY_ATTACH
-@CY_CONSOLE_TRUE@@CY_MACH_TRUE@am__append_12 = Trampoline.t.lo \
+@CY_EXECUTE_TRUE@      JavaScriptCore.cpp
+@CY_EXECUTE_TRUE@am__append_3 = $(LTJAVASCRIPTCORE)
+@CY_EXECUTE_TRUE@am__append_4 = -DCY_EXECUTE
+@CY_EXECUTE_TRUE@am__append_5 = C
+@CY_EXECUTE_TRUE@am__append_6 = Bridge.gperf Bridge.hpp
+@CY_OBJECTIVEC_TRUE@am__append_7 = ObjectiveC
+@CY_OBJECTIVEC_TRUE@am__append_8 = ObjectiveC/Output.cpp ObjectiveC/Replace.cpp ObjectiveC/Library.mm
+@CY_OBJECTIVEC_TRUE@am__append_9 = $(LTOBJECTIVEC)
+@CY_MACH_TRUE@am__append_10 = Handler.mm
+@CY_CONSOLE_TRUE@@CY_MACH_TRUE@am__append_11 = Mach/Inject.cpp
+@CY_CONSOLE_TRUE@@CY_MACH_TRUE@am__append_12 = -DCY_ATTACH
+@CY_CONSOLE_TRUE@@CY_MACH_TRUE@am__append_13 = Trampoline.t.lo \
 @CY_CONSOLE_TRUE@@CY_MACH_TRUE@        libTrampoline.t.la \
 @CY_CONSOLE_TRUE@@CY_MACH_TRUE@        Trampoline.t.hpp
 subdir = .
@@ -163,9 +164,10 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
-LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+LTLIBRARIES = $(lib_LTLIBRARIES)
 libcycript_any_la_DEPENDENCIES =
-am_libcycript_any_la_OBJECTS = Select.lo
+am__libcycript_any_la_SOURCES_DIST = Select.cpp
+@CY_MACH_TRUE@am_libcycript_any_la_OBJECTS = Select.lo
 libcycript_any_la_OBJECTS = $(am_libcycript_any_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -175,36 +177,35 @@ libcycript_any_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
        $(AM_CXXFLAGS) $(CXXFLAGS) $(libcycript_any_la_LDFLAGS) \
        $(LDFLAGS) -o $@
+@CY_MACH_TRUE@am_libcycript_any_la_rpath = -rpath $(libdir)
 am__DEPENDENCIES_1 =
 @CY_EXECUTE_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 @CY_OBJECTIVEC_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
-libcycript_sys_la_DEPENDENCIES = libcycript.la $(am__DEPENDENCIES_1) \
-       $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3)
-am__libcycript_sys_la_SOURCES_DIST = sig/ffi_type.cpp sig/parse.cpp \
-       sig/copy.cpp Bridge.cpp Execute.cpp JavaScriptCore.cpp \
-       Library.cpp Handler.mm
+libcycript_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+       $(am__DEPENDENCIES_3)
+am__libcycript_la_SOURCES_DIST = ConvertUTF.c Decode.cpp Driver.cpp \
+       Highlight.cpp Library.cpp Network.cpp Output.cpp Parser.cpp \
+       Replace.cpp Cycript.tab.cc lex.cy.cpp sig/ffi_type.cpp \
+       sig/parse.cpp sig/copy.cpp Bridge.cpp Execute.cpp \
+       JavaScriptCore.cpp ObjectiveC/Output.cpp \
+       ObjectiveC/Replace.cpp ObjectiveC/Library.mm Handler.mm
 am__dirstamp = $(am__leading_dot)dirstamp
 @CY_EXECUTE_TRUE@am__objects_1 = sig/ffi_type.lo sig/parse.lo \
 @CY_EXECUTE_TRUE@      sig/copy.lo Bridge.lo Execute.lo \
-@CY_EXECUTE_TRUE@      JavaScriptCore.lo Library.lo
-@CY_MACH_TRUE@am__objects_2 = Handler.lo
-am_libcycript_sys_la_OBJECTS = $(am__objects_1) $(am__objects_2)
-libcycript_sys_la_OBJECTS = $(am_libcycript_sys_la_OBJECTS)
-libcycript_sys_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) \
-       $(OBJCXXFLAGS) $(libcycript_sys_la_LDFLAGS) $(LDFLAGS) -o $@
-libcycript_la_LIBADD =
-am__libcycript_la_SOURCES_DIST = ConvertUTF.c Highlight.cpp \
-       Network.cpp Output.cpp Parser.cpp Replace.cpp Cycript.tab.cc \
-       lex.cy.cpp ObjectiveC/Output.cpp ObjectiveC/Replace.cpp \
-       ObjectiveC/Library.mm
-@CY_OBJECTIVEC_TRUE@am__objects_3 = ObjectiveC/Output.lo \
+@CY_EXECUTE_TRUE@      JavaScriptCore.lo
+@CY_OBJECTIVEC_TRUE@am__objects_2 = ObjectiveC/Output.lo \
 @CY_OBJECTIVEC_TRUE@   ObjectiveC/Replace.lo \
 @CY_OBJECTIVEC_TRUE@   ObjectiveC/Library.lo
-am_libcycript_la_OBJECTS = ConvertUTF.lo Highlight.lo Network.lo \
-       Output.lo Parser.lo Replace.lo Cycript.tab.lo lex.cy.lo \
-       $(am__objects_3)
+@CY_MACH_TRUE@am__objects_3 = Handler.lo
+am_libcycript_la_OBJECTS = ConvertUTF.lo Decode.lo Driver.lo \
+       Highlight.lo Library.lo Network.lo Output.lo Parser.lo \
+       Replace.lo Cycript.tab.lo lex.cy.lo $(am__objects_1) \
+       $(am__objects_2) $(am__objects_3)
 libcycript_la_OBJECTS = $(am_libcycript_la_OBJECTS)
+libcycript_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) \
+       $(OBJCXXFLAGS) $(libcycript_la_LDFLAGS) $(LDFLAGS) -o $@
 PROGRAMS = $(bin_PROGRAMS)
 am__cycript_SOURCES_DIST = Console.cpp Display.cpp Mach/Inject.cpp
 @CY_CONSOLE_TRUE@@CY_MACH_TRUE@am__objects_4 = Mach/Inject.$(OBJEXT)
@@ -212,7 +213,7 @@ am__cycript_SOURCES_DIST = Console.cpp Display.cpp Mach/Inject.cpp
 @CY_CONSOLE_TRUE@      Display.$(OBJEXT) $(am__objects_4)
 cycript_OBJECTS = $(am_cycript_OBJECTS)
 @CY_CONSOLE_TRUE@cycript_DEPENDENCIES = libcycript.la \
-@CY_CONSOLE_TRUE@      libcycript-sys.la $(am__DEPENDENCIES_1) \
+@CY_CONSOLE_TRUE@      $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 @CY_CONSOLE_TRUE@      $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -284,10 +285,9 @@ AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
 am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@)
 am__v_OBJCXXLD_0 = @echo "  OBJCXXLD" $@;
 am__v_OBJCXXLD_1 = 
-SOURCES = $(libcycript_any_la_SOURCES) $(libcycript_sys_la_SOURCES) \
-       $(libcycript_la_SOURCES) $(cycript_SOURCES)
-DIST_SOURCES = $(libcycript_any_la_SOURCES) \
-       $(am__libcycript_sys_la_SOURCES_DIST) \
+SOURCES = $(libcycript_any_la_SOURCES) $(libcycript_la_SOURCES) \
+       $(cycript_SOURCES)
+DIST_SOURCES = $(am__libcycript_any_la_SOURCES_DIST) \
        $(am__libcycript_la_SOURCES_DIST) $(am__cycript_SOURCES_DIST)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
        ctags-recursive dvi-recursive html-recursive info-recursive \
@@ -393,6 +393,7 @@ CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CY_ARCH = @CY_ARCH@
 CY_ATTACH_GROUP = @CY_ATTACH_GROUP@
 CY_EXECUTE = @CY_EXECUTE@
 CY_FILTERS = @CY_FILTERS@
@@ -433,6 +434,7 @@ LTFLAGS = @LTFLAGS@
 LTJAVASCRIPTCORE = @LTJAVASCRIPTCORE@
 LTLIBAPR = @LTLIBAPR@
 LTLIBFFI = @LTLIBFFI@
+LTLIBGCC = @LTLIBGCC@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBREADLINE = @LTLIBREADLINE@
 LTLIBTERMCAP = @LTLIBTERMCAP@
@@ -532,33 +534,29 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = subdir-objects
-CLEANFILES = $(am__append_5) $(am__append_12) Cycript.yy Cycript.l \
+CLEANFILES = $(am__append_6) $(am__append_13) Cycript.yy Cycript.l \
        lex.cy.cpp Cycript.tab.cc Cycript.tab.hh location.hh \
        position.hh stack.hh Cycript.output
 SUBDIRS = 
 ACLOCAL_AMFLAGS = -I m4
-
-# XXX: do I really need -fno-common?
-AM_CPPFLAGS = -fno-common -I$(srcdir)/include -DYYDEBUG=1 -include \
-       config.h -include $(srcdir)/unconfig.h $(am__append_3) \
-       $(am__append_11)
+AM_CPPFLAGS = -I$(srcdir)/include -DYYDEBUG=1 -include config.h \
+       -include $(srcdir)/unconfig.h $(am__append_4) $(am__append_12)
 CY_LDFLAGS = -no-undefined -avoid-version -export-dynamic
-noinst_LTLIBRARIES = libcycript.la
-lib_LTLIBRARIES = libcycript-any.la libcycript-sys.la
-libcycript_any_la_SOURCES = Select.cpp
-libcycript_any_la_LDFLAGS = $(CY_LDFLAGS)
-libcycript_any_la_LIBADD = -ldl
-libcycript_la_SOURCES = ConvertUTF.c Highlight.cpp Network.cpp \
-       Output.cpp Parser.cpp Replace.cpp Cycript.tab.cc lex.cy.cpp \
-       $(am__append_7)
-libcycript_sys_la_SOURCES = $(am__append_1) $(am__append_9)
-libcycript_sys_la_LDFLAGS = $(CY_LDFLAGS)
-libcycript_sys_la_LIBADD = libcycript.la $(LTLIBFFI) -ldl \
-       $(am__append_2) $(am__append_8)
-filters = $(CY_FILTERS) $(am__append_4) $(am__append_6)
+lib_LTLIBRARIES = $(am__append_1) libcycript.la
+@CY_MACH_TRUE@libcycript_any_la_SOURCES = Select.cpp
+@CY_MACH_TRUE@libcycript_any_la_LDFLAGS = $(CY_LDFLAGS)
+@CY_MACH_TRUE@libcycript_any_la_LIBADD = -ldl
+libcycript_la_LDFLAGS = $(CY_LDFLAGS)
+libcycript_la_LIBADD = $(LTLIBFFI) $(LTLIBGCC) -ldl $(am__append_3) \
+       $(am__append_9)
+libcycript_la_SOURCES = ConvertUTF.c Decode.cpp Driver.cpp \
+       Highlight.cpp Library.cpp Network.cpp Output.cpp Parser.cpp \
+       Replace.cpp Cycript.tab.cc lex.cy.cpp $(am__append_2) \
+       $(am__append_8) $(am__append_10)
+filters = $(CY_FILTERS) $(am__append_5) $(am__append_7)
 @CY_CONSOLE_TRUE@cycript_SOURCES = Console.cpp Display.cpp \
-@CY_CONSOLE_TRUE@      $(am__append_10)
-@CY_CONSOLE_TRUE@cycript_LDADD = libcycript.la libcycript-sys.la $(LTLIBAPR) $(LTLIBREADLINE) $(LTLIBTERMCAP) -ldl
+@CY_CONSOLE_TRUE@      $(am__append_11)
+@CY_CONSOLE_TRUE@cycript_LDADD = libcycript.la $(LTLIBAPR) $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) -ldl
 @CY_CONSOLE_TRUE@ldid = true
 @CY_CONSOLE_TRUE@entitle = $(ldid) -S$(srcdir)/cycript.xml
 all: config.h
@@ -651,19 +649,8 @@ clean-libLTLIBRARIES:
          rm -f $${locs}; \
        }
 
-clean-noinstLTLIBRARIES:
-       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-       @list='$(noinst_LTLIBRARIES)'; \
-       locs=`for p in $$list; do echo $$p; done | \
-             sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-             sort -u`; \
-       test -z "$$locs" || { \
-         echo rm -f $${locs}; \
-         rm -f $${locs}; \
-       }
-
 libcycript-any.la: $(libcycript_any_la_OBJECTS) $(libcycript_any_la_DEPENDENCIES) $(EXTRA_libcycript_any_la_DEPENDENCIES) 
-       $(AM_V_CXXLD)$(libcycript_any_la_LINK) -rpath $(libdir) $(libcycript_any_la_OBJECTS) $(libcycript_any_la_LIBADD) $(LIBS)
+       $(AM_V_CXXLD)$(libcycript_any_la_LINK) $(am_libcycript_any_la_rpath) $(libcycript_any_la_OBJECTS) $(libcycript_any_la_LIBADD) $(LIBS)
 sig/$(am__dirstamp):
        @$(MKDIR_P) sig
        @: > sig/$(am__dirstamp)
@@ -673,9 +660,6 @@ sig/$(DEPDIR)/$(am__dirstamp):
 sig/ffi_type.lo: sig/$(am__dirstamp) sig/$(DEPDIR)/$(am__dirstamp)
 sig/parse.lo: sig/$(am__dirstamp) sig/$(DEPDIR)/$(am__dirstamp)
 sig/copy.lo: sig/$(am__dirstamp) sig/$(DEPDIR)/$(am__dirstamp)
-
-libcycript-sys.la: $(libcycript_sys_la_OBJECTS) $(libcycript_sys_la_DEPENDENCIES) $(EXTRA_libcycript_sys_la_DEPENDENCIES) 
-       $(AM_V_OBJCXXLD)$(libcycript_sys_la_LINK) -rpath $(libdir) $(libcycript_sys_la_OBJECTS) $(libcycript_sys_la_LIBADD) $(LIBS)
 ObjectiveC/$(am__dirstamp):
        @$(MKDIR_P) ObjectiveC
        @: > ObjectiveC/$(am__dirstamp)
@@ -690,7 +674,7 @@ ObjectiveC/Library.lo: ObjectiveC/$(am__dirstamp) \
        ObjectiveC/$(DEPDIR)/$(am__dirstamp)
 
 libcycript.la: $(libcycript_la_OBJECTS) $(libcycript_la_DEPENDENCIES) $(EXTRA_libcycript_la_DEPENDENCIES) 
-       $(AM_V_OBJCXXLD)$(OBJCXXLINK)  $(libcycript_la_OBJECTS) $(libcycript_la_LIBADD) $(LIBS)
+       $(AM_V_OBJCXXLD)$(libcycript_la_LINK) -rpath $(libdir) $(libcycript_la_OBJECTS) $(libcycript_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
        @$(NORMAL_INSTALL)
        @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -768,7 +752,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Console.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConvertUTF.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cycript.tab.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Decode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Display.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Driver.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Execute.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Handler.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Highlight.Plo@am__quote@
@@ -1133,9 +1119,10 @@ distcheck: dist
          && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
          && am__cwd=`pwd` \
          && $(am__cd) $(distdir)/_build \
-         && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+         && ../configure \
            $(AM_DISTCHECK_CONFIGURE_FLAGS) \
            $(DISTCHECK_CONFIGURE_FLAGS) \
+           --srcdir=.. --prefix="$$dc_install_base" \
          && $(MAKE) $(AM_MAKEFLAGS) \
          && $(MAKE) $(AM_MAKEFLAGS) dvi \
          && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1238,7 +1225,7 @@ maintainer-clean-generic:
 clean: clean-recursive
 
 clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-       clean-libtool clean-noinstLTLIBRARIES mostlyclean-am
+       clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -1314,13 +1301,12 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
        am--refresh check check-am clean clean-binPROGRAMS \
        clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \
-       clean-noinstLTLIBRARIES cscope cscopelist-am ctags ctags-am \
-       dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \
-       dist-tarZ dist-xz dist-zip distcheck distclean \
-       distclean-compile distclean-generic distclean-hdr \
-       distclean-libtool distclean-tags distcleancheck distdir \
-       distuninstallcheck dvi dvi-am html html-am info info-am \
-       install install-am install-binPROGRAMS install-data \
+       cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+       dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+       distcheck distclean distclean-compile distclean-generic \
+       distclean-hdr distclean-libtool distclean-tags distcleancheck \
+       distdir distuninstallcheck dvi dvi-am html html-am info \
+       info-am install install-am install-binPROGRAMS install-data \
        install-data-am install-dvi install-dvi-am install-exec \
        install-exec-am install-html install-html-am install-info \
        install-info-am install-libLTLIBRARIES install-man install-pdf \
@@ -1342,9 +1328,9 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES
 
 @CY_CONSOLE_TRUE@@CY_MACH_TRUE@Mach/Inject.$(OBJEXT): Trampoline.t.hpp
 @CY_CONSOLE_TRUE@@CY_MACH_TRUE@Trampoline.t.lo: Trampoline.t.cpp Trampoline.hpp Baton.hpp Standard.hpp
-@CY_CONSOLE_TRUE@@CY_MACH_TRUE@        $(LTCXXCOMPILE) -c -o $@ $< -fno-stack-protector -fno-exceptions -O0
+@CY_CONSOLE_TRUE@@CY_MACH_TRUE@        $(LTCXXCOMPILE) $(CY_ARCH) -c -o $@ $< -fno-stack-protector -O0
 @CY_CONSOLE_TRUE@@CY_MACH_TRUE@libTrampoline.t.la: Trampoline.t.lo
-@CY_CONSOLE_TRUE@@CY_MACH_TRUE@        $(CXXLINK) -rpath $(libdir) $^
+@CY_CONSOLE_TRUE@@CY_MACH_TRUE@        $(CXXLINK) $(CY_ARCH) -rpath $(libdir) $^
 @CY_CONSOLE_TRUE@@CY_MACH_TRUE@Trampoline.t.hpp: libTrampoline.t.la trampoline.sh
 @CY_CONSOLE_TRUE@@CY_MACH_TRUE@        $(srcdir)/trampoline.sh $@ .libs/libTrampoline.t.dylib Trampoline $(SED) $(LIPO) $(NM) $(OTOOL)
 @CY_CONSOLE_TRUE@@CY_MACH_TRUE@        ! grep '## symbol stub for:' $@
@@ -1355,9 +1341,10 @@ Cycript.l: Cycript.l.in
 lex.cy.cpp: Cycript.l
        $(FLEX) -t $< | $(SED) -e 's/int yyl;/yy_size_t yyl;/;s/int yyleng_r;/yy_size_t yyleng_r;/' >$@
 
-Console.lo Execute.lo Highlight.lo Library.lo Parser.lo lex.cy.lo: Cycript.tab.hh
+Console.$(OBJEXT) Cycript.tab.lo Driver.lo Handler.lo Highlight.lo Library.lo lex.cy.lo: Cycript.tab.hh
 Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.output: Cycript.yy
        $(BISON) -v --report=state $<
+       ! grep -n '^State [0-9]* conflicts:' Cycript.output
        ! grep -n '^ *$$default  reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Cycript.output -B 2 | grep 'shift, and go to state [0-9]*$$'
        ! grep -n '^ *$$default  reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Cycript.output -B 2 | grep -v '$$default' | grep 'reduce using rule [0-9]* ([^)]*)$$'