Instance's toPointer() should return as CFTypeRef.

[cycript.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b80bb1eda0f6748beed3c526cb2e6f84df52ffff..289dd16b4453784832b78c9bbdb43e32829672f1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,19 +85,26 @@ AM_CPPFLAGS += -DCY_EXECUTE
 filters += C
 
 CLEANFILES += libcycript.db
-libcycript.db: Bridge.def libcycript.sh
-       $(srcdir)/libcycript.sh $(CY_SYSTEM) $@ $<
+libcycript.db: Bridge.def libcycript.py
+       $(srcdir)/libcycript.py $(CY_SYSTEM) $@ $(srcdir) <$<
 
 if CY_PRELINK
 CY_LANGFLAGS = -DCY_JAVA=$(CY_JAVA) -DCY_PYTHON=$(CY_PYTHON) -DCY_OBJECTIVEC=$(CY_OBJECTIVEC)
 
+if CY_ANDROID
+CY_ANDFLAGS = -U__APPLE__ -D__ANDROID__
+else
+CY_ANDFLAGS = 
+endif
+
 CLEANFILES += Analyze
 Analyze: Analyze.cpp Error.cpp Output.cpp Replace.cpp Syntax.cpp
        $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) -std=c++11 $(LDFLAGS_FOR_BUILD) $(CY_LANGFLAGS) -I$(srcdir)/extra -o $@ $^ $(CY_LIBCLANG) -Wno-bitwise-op-parentheses -Wno-dangling-else -Wno-logical-op-parentheses
 
 CLEANFILES += Bridge.def
-Bridge.def: Analysis.cpp Analyze
-       ./Analyze $< $(OBJCXX) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(CY_LANGFLAGS) >$@
+Bridge.def: Analysis.cpp Analyze Bridge.old
+       ./Analyze $< $(OBJCXX) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(CY_LANGFLAGS) $(CY_ANDFLAGS) >$@
+       cat $(srcdir)/Bridge.old >>$@
 else
 CLEANFILES += Bridge.def
 Bridge.def: Bridge.def.in
@@ -116,7 +123,6 @@ endif
 if CY_JAVA
 filters += Java
 libcycript_la_SOURCES += Java/Execute.cpp
-libcycript_la_LIBADD += $(LTJAVA)
 dat_DATA += libcycript.jar
 
 CLEANFILES += Class
@@ -149,13 +155,10 @@ libcycript_la_SOURCES += ObjectiveC/Output.cpp ObjectiveC/Replace.cpp ObjectiveC
 libcycript_la_LIBADD += $(LTOBJECTIVEC)
 endif
 
-if CY_ATTACH
 libcycript_la_SOURCES += Handler.cpp
 
 if CY_CONSOLE
 cycript_SOURCES += Inject.cpp
-AM_CPPFLAGS += -DCY_ATTACH
-endif
 endif
 
 CLEANFILES += Parser.ypp