Sort-of improve multi-line editor when in vi mode.

[cycript.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e82a626da8a40e47bcf43ebe50a660f31899376f..3a71b357e0e25c9fda599cb0d0f893bea8798c68 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,20 @@
 # Cycript - Optimizing JavaScript Compiler/Runtime
 # Cycript - Optimizing JavaScript Compiler/Runtime

-# Copyright (C) 2009-2013  Jay Freeman (saurik)
+# Copyright (C) 2009-2015  Jay Freeman (saurik)

 
 

-# GNU General Public License, Version 3 {{{
+# GNU Affero General Public License, Version 3 {{{

 #
 #

-# Cycript is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published
-# by the Free Software Foundation, either version 3 of the License,
-# or (at your option) any later version.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.

 #
 #

-# Cycript is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of

 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-# GNU General Public License for more details.
+# GNU Affero General Public License for more details.

 #
 #

-# You should have received a copy of the GNU General Public License
-# along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # }}}
 
 .DELETE_ON_ERROR:
 # }}}
 
 .DELETE_ON_ERROR:


@@ -25,46 +25,40 @@ 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 = -DYYDEBUG=1

 AM_CPPFLAGS += -include config.h -include $(srcdir)/unconfig.h
 
 AM_CPPFLAGS += -include config.h -include $(srcdir)/unconfig.h
 

-CY_LDFLAGS = -no-undefined -avoid-version -export-dynamic
+AM_CFLAGS = -fvisibility=hidden
+AM_CXXFLAGS = -fvisibility=hidden
+AM_OBJCXXFLAGS = -fvisibility=hidden
+AM_LDFLAGS = -fvisibility=hidden

 
 

-noinst_LTLIBRARIES = 
-lib_LTLIBRARIES = 
+AM_OBJCXXFLAGS += -fobjc-exceptions

 
 

-noinst_LTLIBRARIES += libcycript.la
+CY_LDFLAGS = -no-undefined -avoid-version -export-dynamic

 
 

-lib_LTLIBRARIES += libcycript-any.la
-libcycript_any_la_SOURCES = Select.cpp
-libcycript_any_la_LDFLAGS = $(CY_LDFLAGS)
-libcycript_any_la_LIBADD = -ldl
+lib_LTLIBRARIES = 

 
 

-libcycript_la_SOURCES = ConvertUTF.c Highlight.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp
-libcycript_la_SOURCES += Cycript.tab.cc
-libcycript_la_SOURCES += lex.cy.cpp
+lib_LTLIBRARIES += libcycript.la
+libcycript_la_LDFLAGS = $(CY_LDFLAGS)
+libcycript_la_LIBADD = $(LTLIBUV) $(LTLIBFFI) $(LTLIBGCC) -ldl

 
 

-lib_LTLIBRARIES += libcycript-sys.la
-libcycript_sys_la_SOURCES = 
-libcycript_sys_la_LDFLAGS = $(CY_LDFLAGS)
-libcycript_sys_la_LIBADD = libcycript.la $(LTLIBFFI) -ldl
+libcycript_la_SOURCES = ConvertUTF.c Decode.cpp Driver.cpp Highlight.cpp Library.cpp Network.cpp Output.cpp Replace.cpp Syntax.cpp
+libcycript_la_SOURCES += Parser.cpp Scanner.cpp

 
 

-filters = $(CY_FILTERS)
+filters = 

 
 if CY_CONSOLE
 bin_PROGRAMS = cycript
 
 if CY_CONSOLE
 bin_PROGRAMS = cycript

-cycript_SOURCES = Console.cpp Display.cpp
-cycript_LDADD = libcycript.la libcycript-sys.la $(LTLIBAPR) $(LTLIBREADLINE) $(LTLIBTERMCAP) -ldl
-
-ldid = true
-entitle = $(ldid) -S$(srcdir)/cycript.xml
+cycript_SOURCES = Console.cpp
+cycript_LDADD = libcycript.la $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) $(PTHREAD_CFLAGS) -ldl
+libcycript_la_SOURCES += Complete.cpp

 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


@@ -77,56 +71,49 @@ Bridge.gperf: Bridge.def Bridge.sh
 
 CLEANFILES += Bridge.hpp
 Bridge.hpp: Bridge.gperf
 
 CLEANFILES += Bridge.hpp
 Bridge.hpp: Bridge.gperf

-       $(GPERF) $< | $(SED) -e 's/defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__/0/' >$@
+       $(GPERF) $< >$@
+endif
+
+if CY_JAVA
+filters += Java
+libcycript_la_SOURCES += Java/Execute.cpp
+libcycript_la_LIBADD += $(LTJAVA)

 endif
 
 if CY_OBJECTIVEC
 filters += ObjectiveC
 libcycript_la_SOURCES += ObjectiveC/Output.cpp ObjectiveC/Replace.cpp ObjectiveC/Library.mm
 endif
 
 if CY_OBJECTIVEC
 filters += ObjectiveC
 libcycript_la_SOURCES += ObjectiveC/Output.cpp ObjectiveC/Replace.cpp ObjectiveC/Library.mm

-libcycript_sys_la_LIBADD += $(LTOBJECTIVEC)
+libcycript_la_LIBADD += $(LTOBJECTIVEC)

 endif
 
 endif
 

-if CY_MACH
-libcycript_sys_la_SOURCES += Handler.mm
+if CY_ATTACH
+libcycript_la_SOURCES += Handler.cpp

 
 if CY_CONSOLE
 
 if CY_CONSOLE

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

 AM_CPPFLAGS += -DCY_ATTACH
 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
-       $(LTCXXCOMPILE) -c -o $@ $< -fno-stack-protector -fno-exceptions -O0
-
-CLEANFILES += libTrampoline.t.la
-libTrampoline.t.la: Trampoline.t.lo
-       $(CXXLINK) -rpath $(libdir) $^
-
-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
 
 endif
 endif
 

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

 
 

-CLEANFILES += Cycript.l
-Cycript.l: Cycript.l.in
-       $(srcdir)/Filter.sh <$< >$@ $(filters)
+CLEANFILES += Scanner.lpp
+Scanner.lpp: Scanner.lpp.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;/' >$@
+CLEANFILES += Scanner.cpp Scanner.output lex.backup
+Scanner.cpp: Scanner.lpp
+       $(FLEX) $(LFLAGS) -o $@ -T $< 2>Scanner.output || (grep -F '$<:' Scanner.output; false)
+       grep -E '^(No backing up\.|Compressed tables always back up\.)$$' lex.backup >/dev/null
+       ! grep -F ': warning, ' Scanner.output || true

 
 

-Console.lo Execute.lo Highlight.lo Library.lo Parser.lo lex.cy.lo: Cycript.tab.hh
+Scanner.lo: Parser.hpp

 
 

-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 '^ *$$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]* ([^)]*)$$'
+CLEANFILES += Parser.cpp Parser.hpp stack.hh Parser.output
+Parser.cpp Parser.hpp stack.hh Parser.output: Parser.ypp
+       $(BISON) -v --report=state -Werror -o Parser.cpp $<
+       ! grep -n '^State [0-9]* conflicts:' Parser.output
+       ! grep -n '^ *$$default *reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Parser.output -B 2 | grep 'shift, and go to state [0-9]*$$'
+       ! grep -n '^ *$$default *reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Parser.output -B 2 | grep -v '$$default' | grep 'reduce using rule [0-9]* ([^)]*)$$'