Manually unify CYLocal<CYPool>::key_ into Library.

[cycript.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 232f64a15faef45dbd43ddca83b6509e22acae45..ef426a222943fcad455524d9611c6c7eecfe2bf1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,6 @@
 # along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 # }}}
 
 # along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 # }}}
 

-SHELL = @_BASH@
-

 .DELETE_ON_ERROR:
 
 AUTOMAKE_OPTIONS = subdir-objects
 .DELETE_ON_ERROR:
 
 AUTOMAKE_OPTIONS = subdir-objects


@@ -27,29 +25,35 @@ SUBDIRS =
 
 ACLOCAL_AMFLAGS = -I m4
 
 
 ACLOCAL_AMFLAGS = -I m4
 

-# XXX: do I really need -fno-common?
-AM_CPPFLAGS = -Werror -fno-common -I$(srcdir)/include -DYYDEBUG=1
+AM_CPPFLAGS = -I$(srcdir)/include -DYYDEBUG=1
+AM_CPPFLAGS += -include config.h -include $(srcdir)/unconfig.h
+
+CY_LDFLAGS = -no-undefined -avoid-version -export-dynamic
+
+lib_LTLIBRARIES = 

 
 

-lib_LTLIBRARIES = libcycript.la
-libcycript_la_SOURCES = Highlight.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp
-libcycript_la_LDFLAGS = -no-undefined $(LTLIBAPR) $(LTLIBICONV) -ldl
+lib_LTLIBRARIES += libcycript.la
+libcycript_la_LDFLAGS = $(CY_LDFLAGS)
+libcycript_la_LIBADD = $(LTLIBFFI) $(LTLIBGCC) -ldl

 
 

-libcycript_la_SOURCES += Cycript.tab.cc
-libcycript_la_SOURCES += lex.cy.cpp
+libcycript_la_SOURCES = ConvertUTF.c Decode.cpp Driver.cpp Highlight.cpp Library.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp
+libcycript_la_SOURCES += Cycript.tab.cc lex.cy.cpp
+
+filters = $(CY_FILTERS)

 
 

+if CY_CONSOLE

 bin_PROGRAMS = cycript
 cycript_SOURCES = Console.cpp Display.cpp
 bin_PROGRAMS = cycript
 cycript_SOURCES = Console.cpp Display.cpp

-cycript_LDFLAGS = $(LTLIBAPR) $(LTLIBREADLINE) $(LTLIBTERMCAP) -ldl
-cycript_LDADD = libcycript.la
+cycript_LDADD = libcycript.la $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) -ldl

 
 ldid = true
 
 ldid = true

-entitle = $(ldid) -Scycript.xml
-
-filters = $(CY_FILTERS)
+entitle = $(ldid) -S$(srcdir)/cycript.xml
+endif

 
 if CY_EXECUTE
 libcycript_la_SOURCES += sig/ffi_type.cpp sig/parse.cpp sig/copy.cpp
 
 if CY_EXECUTE
 libcycript_la_SOURCES += sig/ffi_type.cpp sig/parse.cpp sig/copy.cpp

-libcycript_la_SOURCES += Bridge.cpp Execute.cpp JavaScriptCore.cpp Library.cpp
+libcycript_la_SOURCES += Bridge.cpp Execute.cpp JavaScriptCore.cpp
+libcycript_la_LIBADD += $(LTJAVASCRIPTCORE)

 
 AM_CPPFLAGS += -DCY_EXECUTE
 filters += C
 
 AM_CPPFLAGS += -DCY_EXECUTE
 filters += C


@@ -67,20 +71,23 @@ endif
 
 if CY_OBJECTIVEC
 filters += ObjectiveC
 
 if CY_OBJECTIVEC
 filters += ObjectiveC

-libcycript_la_SOURCES += ObjectiveC/Output.mm ObjectiveC/Replace.cpp ObjectiveC/Library.mm
+libcycript_la_SOURCES += ObjectiveC/Output.cpp ObjectiveC/Replace.cpp ObjectiveC/Library.mm
+libcycript_la_LIBADD += $(LTOBJECTIVEC)

 endif
 
 if CY_MACH
 libcycript_la_SOURCES += Handler.mm
 endif
 
 if CY_MACH
 libcycript_la_SOURCES += Handler.mm

+
+if CY_CONSOLE

 cycript_SOURCES += Mach/Inject.cpp
 
 cycript_SOURCES += Mach/Inject.cpp
 

-AM_CPPFLAGS += -DCY_ATTACH -DCY_LIBRARY='"$(libdir)/libcycript.$(SO)"'
+AM_CPPFLAGS += -DCY_ATTACH

 
 Mach/Inject.$(OBJEXT): Trampoline.t.hpp
 
 CLEANFILES += Trampoline.t.lo
 Trampoline.t.lo: Trampoline.t.cpp Trampoline.hpp Baton.hpp Standard.hpp
 
 Mach/Inject.$(OBJEXT): Trampoline.t.hpp
 
 CLEANFILES += Trampoline.t.lo
 Trampoline.t.lo: Trampoline.t.cpp Trampoline.hpp Baton.hpp Standard.hpp

-       $(LTCXXCOMPILE) $(CY_ARCH) -c -o $@ $< -fno-stack-protector -fno-exceptions -O0
+       $(LTCXXCOMPILE) $(CY_ARCH) -c -o $@ $< -fno-stack-protector -O0

 
 CLEANFILES += libTrampoline.t.la
 libTrampoline.t.la: Trampoline.t.lo
 
 CLEANFILES += libTrampoline.t.la
 libTrampoline.t.la: Trampoline.t.lo


@@ -89,6 +96,8 @@ libTrampoline.t.la: Trampoline.t.lo
 CLEANFILES += Trampoline.t.hpp
 Trampoline.t.hpp: libTrampoline.t.la trampoline.sh
        $(srcdir)/trampoline.sh $@ .libs/libTrampoline.t.dylib Trampoline $(SED) $(LIPO) $(NM) $(OTOOL)
 CLEANFILES += Trampoline.t.hpp
 Trampoline.t.hpp: libTrampoline.t.la trampoline.sh
        $(srcdir)/trampoline.sh $@ .libs/libTrampoline.t.dylib Trampoline $(SED) $(LIPO) $(NM) $(OTOOL)

+       ! grep '## symbol stub for:' $@
+endif

 endif
 
 CLEANFILES += Cycript.yy
 endif
 
 CLEANFILES += Cycript.yy


@@ -103,10 +112,11 @@ CLEANFILES += lex.cy.cpp
 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;/' >$@
 
 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

 
 CLEANFILES += Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.output
 Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.output: Cycript.yy
        $(BISON) -v --report=state $<
 
 CLEANFILES += Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.output
 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]* ([^)]*)$$'
        ! 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]* ([^)]*)$$'