X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/6ce9ac92241f16964b2a253800058c04bd21f14f..d9c911529b1480684bb8b6280410f2d09c8525a1:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4c76c6d..2cc8b2a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # Cycript - Optimizing JavaScript Compiler/Runtime
-# Copyright (C) 2009-2014  Jay Freeman (saurik)
+# Copyright (C) 2009-2015  Jay Freeman (saurik)
 
 # GNU Affero General Public License, Version 3 {{{
 #
@@ -25,9 +25,16 @@ SUBDIRS =
 
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CPPFLAGS = -I$(srcdir)/include -DYYDEBUG=1
+AM_CPPFLAGS = -DYYDEBUG=1
 AM_CPPFLAGS += -include config.h -include $(srcdir)/unconfig.h
 
+AM_CFLAGS = -fvisibility=hidden
+AM_CXXFLAGS = -fvisibility=hidden
+AM_OBJCXXFLAGS = -fvisibility=hidden
+AM_LDFLAGS = -fvisibility=hidden
+
+AM_OBJCXXFLAGS += -fobjc-exceptions
+
 CY_LDFLAGS = -no-undefined -avoid-version -export-dynamic
 
 lib_LTLIBRARIES = 
@@ -44,10 +51,8 @@ filters =
 if CY_CONSOLE
 bin_PROGRAMS = cycript
 cycript_SOURCES = Console.cpp Display.cpp
-cycript_LDADD = libcycript.la $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) -ldl
-
-ldid = true
-entitle = $(ldid) -S$(srcdir)/cycript.xml
+cycript_LDADD = libcycript.la $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) $(PTHREAD_CFLAGS) -ldl
+libcycript_la_SOURCES += Complete.cpp
 endif
 
 if CY_EXECUTE
@@ -81,32 +86,33 @@ libcycript_la_SOURCES += ObjectiveC/Output.cpp ObjectiveC/Replace.cpp ObjectiveC
 libcycript_la_LIBADD += $(LTOBJECTIVEC)
 endif
 
-if CY_MACH
-libcycript_la_SOURCES += Handler.mm
+if CY_ATTACH
+libcycript_la_SOURCES += Handler.cpp
 
 if CY_CONSOLE
-cycript_SOURCES += Mach/Inject.cpp
+cycript_SOURCES += Inject.cpp
 AM_CPPFLAGS += -DCY_ATTACH
 endif
 endif
 
 CLEANFILES += Cycript.yy
 Cycript.yy: Cycript.yy.in
-	$(srcdir)/Filter.sh <$< >$@ $(filters)
+	$(srcdir)/Filter.sh $< >$@ $(filters)
 
 CLEANFILES += Cycript.l
-Cycript.l: Cycript.l.in
-	$(srcdir)/Filter.sh <$< >$@ $(filters)
+Cycript.l: Cycript.l.in UnicodeIDStart.l UnicodeIDContinue.l
+	$(srcdir)/Filter.sh $< >$@ $(filters)
 
 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;/' >$@
+	$(FLEX) -b -t $< | $(SED) -e 's/int yyl;/yy_size_t yyl;/;s/int yyleng_r;/yy_size_t yyleng_r;/;s/yyg =/yyg __attribute__((__unused__)) =/' >$@
+	grep -F 'No backing up.' lex.backup >/dev/null
 
 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 stack.hh Cycript.output
+Cycript.tab.cc Cycript.tab.hh stack.hh Cycript.output: Cycript.yy
+	$(BISON) -v --report=state -Werror $<
 	! 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]* ([^)]*)$$'