Add --disable-console option to configure script.

[cycript.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f1e63349ee0c7c94151fe73c09cfb3b49ee402f5..58303f82591a02db182b590b5aaf4ff78573cfdb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,9 +26,10 @@ SUBDIRS =
 ACLOCAL_AMFLAGS = -I m4
 
 # XXX: do I really need -fno-common?
-AM_CPPFLAGS = -Werror -fno-common -I$(srcdir)/include -DYYDEBUG=1
+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)
@@ -43,13 +44,14 @@ libcycript_la_LDFLAGS = $(AM_LDFLAGS) $(CY_LDFLAGS)
 libcycript_la_LIBADD = -ldl
 
 lib_LTLIBRARIES += libcycript-sys.la
-libcycript_sys_la_SOURCES = Highlight.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp
+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) $(LTLIBICONV) -ldl
+libcycript_sys_la_LIBADD = $(LTLIBFFI) -ldl
 
 libcycript_sys_la_SOURCES += Cycript.tab.cc
 libcycript_sys_la_SOURCES += lex.cy.cpp
 
+if CY_CONSOLE
 bin_PROGRAMS = cycript
 cycript_SOURCES = Console.cpp Display.cpp
 cycript_LDADD = libcycript.la libcycript-sys.la $(LTLIBAPR) $(LTLIBREADLINE) $(LTLIBTERMCAP) -ldl
@@ -58,6 +60,7 @@ ldid = true
 entitle = $(ldid) -Scycript.xml
 
 filters = $(CY_FILTERS)
+endif
 
 if CY_EXECUTE
 libcycript_sys_la_SOURCES += sig/ffi_type.cpp sig/parse.cpp sig/copy.cpp
@@ -80,12 +83,14 @@ endif
 
 if CY_OBJECTIVEC
 filters += ObjectiveC
-libcycript_sys_la_SOURCES += ObjectiveC/Output.mm ObjectiveC/Replace.cpp ObjectiveC/Library.mm
+libcycript_sys_la_SOURCES += ObjectiveC/Output.cpp ObjectiveC/Replace.cpp ObjectiveC/Library.mm
 libcycript_sys_la_LIBADD += $(LTOBJECTIVEC)
 endif
 
 if CY_MACH
 libcycript_sys_la_SOURCES += Handler.mm
+
+if CY_CONSOLE
 cycript_SOURCES += Mach/Inject.cpp
 
 AM_CPPFLAGS += -DCY_ATTACH
@@ -105,6 +110,7 @@ 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
 
 libcycript_sim_la_SHORTNAME = sim
 if CY_IOS_SIMULATOR
@@ -112,16 +118,16 @@ 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_IOS_SIMULATOR)
+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) $(LTLIBICONV) -ldl
+libcycript_sim_la_LIBADD = $(LTOBJECTIVEC) -ldl
 libcycript_sim_la_LIBADD += $(LTOBJECTIVEC) $(LTJAVASCRIPTCORE)
 
-libcycript_sim_la_CPPFLAGS += -idirafter /usr/include
-libcycript_sim_la_LDFLAGS += -Wl,/usr/lib/libffi.dylib
+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