Detect jni.h and link Android build against Dalvik.

[cycript.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 58303f82591a02db182b590b5aaf4ff78573cfdb..eaf4c4e0e45f3e37dcbcb4ffdbc66a7ec8b6668b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,47 +25,35 @@ SUBDIRS =
 
 ACLOCAL_AMFLAGS = -I m4
 
 
 ACLOCAL_AMFLAGS = -I m4
 

-# XXX: do I really need -fno-common?
-AM_CPPFLAGS = -fno-common -I$(srcdir)/include -DYYDEBUG=1
-AM_CPPFLAGS += -include $(srcdir)/config.h -include $(srcdir)/unconfig.h
-
-AM_CFLAGS = $(CY_ARCH)
-AM_CXXFLAGS = $(CY_ARCH)
-AM_OBJCXXFLAGS = $(CY_ARCH)
-AM_LDFLAGS = $(CY_ARCH)
+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
 
 CY_LDFLAGS = -no-undefined -avoid-version -export-dynamic
 
 lib_LTLIBRARIES = 
 
 lib_LTLIBRARIES += libcycript.la

-libcycript_la_SOURCES = Select.cpp
-libcycript_la_LDFLAGS = $(AM_LDFLAGS) $(CY_LDFLAGS)
-libcycript_la_LIBADD = -ldl
+libcycript_la_LDFLAGS = $(CY_LDFLAGS)
+libcycript_la_LIBADD = $(LTLIBFFI) $(LTLIBGCC) -ldl

 
 

-lib_LTLIBRARIES += libcycript-sys.la
-libcycript_sys_la_SOURCES = ConvertUTF.c Highlight.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp
-libcycript_sys_la_LDFLAGS = $(AM_LDFLAGS) $(CY_LDFLAGS)
-libcycript_sys_la_LIBADD = $(LTLIBFFI) -ldl
+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

 
 

-libcycript_sys_la_SOURCES += Cycript.tab.cc
-libcycript_sys_la_SOURCES += lex.cy.cpp
+filters = $(CY_FILTERS)

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

-cycript_LDADD = libcycript.la libcycript-sys.la $(LTLIBAPR) $(LTLIBREADLINE) $(LTLIBTERMCAP) -ldl
+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
 endif
 
 if CY_EXECUTE

-libcycript_sys_la_SOURCES += sig/ffi_type.cpp sig/parse.cpp sig/copy.cpp
-libcycript_sys_la_SOURCES += Bridge.cpp Execute.cpp JavaScriptCore.cpp Library.cpp
-libcycript_sys_la_LIBADD += $(LTJAVASCRIPTCORE)
+libcycript_la_SOURCES += sig/ffi_type.cpp sig/parse.cpp sig/copy.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


@@ -81,14 +69,20 @@ Bridge.hpp: Bridge.gperf
        $(GPERF) $< | $(SED) -e 's/defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__/0/' >$@
 endif
 
        $(GPERF) $< | $(SED) -e 's/defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__/0/' >$@
 endif
 

+if CY_JAVA
+filters += Java
+libcycript_la_SOURCES += 
+libcycript_la_LIBADD += $(LTJAVA)
+endif
+

 if CY_OBJECTIVEC
 filters += ObjectiveC
 if CY_OBJECTIVEC
 filters += ObjectiveC

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

 endif
 
 if CY_MACH
 endif
 
 if CY_MACH

-libcycript_sys_la_SOURCES += Handler.mm
+libcycript_la_SOURCES += Handler.mm

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


@@ -99,7 +93,7 @@ Mach/Inject.$(OBJEXT): Trampoline.t.hpp
 
 CLEANFILES += Trampoline.t.lo
 Trampoline.t.lo: Trampoline.t.cpp Trampoline.hpp Baton.hpp Standard.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


@@ -112,26 +106,6 @@ Trampoline.t.hpp: libTrampoline.t.la trampoline.sh
 endif
 endif
 
 endif
 endif
 

-libcycript_sim_la_SHORTNAME = sim
-if CY_IOS_SIMULATOR
-lib_LTLIBRARIES += libcycript-sim.la
-libcycript_sim_la_SOURCES = $(libcycript_sys_la_SOURCES)
-libcycript_sim_la_CPPFLAGS = $(AM_CPPFLAGS)
-
-CY_SIM_FLAGS = -arch i386 -isysroot $(CY_XCODE_IOSSIMSDK)
-libcycript_sim_la_CXXFLAGS = $(CY_SIM_FLAGS)
-libcycript_sim_la_OBJCXXFLAGS = $(CY_SIM_FLAGS)
-libcycript_sim_la_LDFLAGS = $(CY_SIM_FLAGS) $(CY_LDFLAGS)
-
-libcycript_sim_la_LIBADD = $(LTOBJECTIVEC) -ldl
-libcycript_sim_la_LIBADD += $(LTOBJECTIVEC) $(LTJAVASCRIPTCORE)
-
-libcycript_sim_la_CPPFLAGS += -idirafter $(CY_XCODE_MACOSXSDK)/usr/include
-libcycript_sim_la_LDFLAGS += -Wl,/usr/lib/libffi.dylib -mios-simulator-version-min=2.0
-
-libcycript_sim_la_OBJCXXFLAGS += -fobjc-abi-version=2 -fobjc-legacy-dispatch
-endif
-

 CLEANFILES += Cycript.yy
 Cycript.yy: Cycript.yy.in
        $(srcdir)/Filter.sh <$< >$@ $(filters)
 CLEANFILES += Cycript.yy
 Cycript.yy: Cycript.yy.in
        $(srcdir)/Filter.sh <$< >$@ $(filters)


@@ -144,10 +118,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]* ([^)]*)$$'