Update included configure to match autoconf input.

[cycript.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0d73879d366efd3d4c8f4f154ac84b9a73980166..67ca54d8e5c51067c51cc84f7b85a76fd36c5d8b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,22 @@
+# Cycript - Optimizing JavaScript Compiler/Runtime
+# Copyright (C) 2009-2013  Jay Freeman (saurik)
+
+# GNU 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.
+#
+# Cycript 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
+# GNU 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/>.
+# }}}
+

 SHELL = @_BASH@
 
 .DELETE_ON_ERROR:
 SHELL = @_BASH@
 
 .DELETE_ON_ERROR:


@@ -10,18 +29,19 @@ ACLOCAL_AMFLAGS = -I m4
 
 # XXX: do I really need -fno-common?
 AM_CPPFLAGS = -Werror -fno-common -I$(srcdir)/include -DYYDEBUG=1
 
 # XXX: do I really need -fno-common?
 AM_CPPFLAGS = -Werror -fno-common -I$(srcdir)/include -DYYDEBUG=1

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

 
 lib_LTLIBRARIES = libcycript.la
 libcycript_la_SOURCES = Highlight.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp
 
 lib_LTLIBRARIES = libcycript.la
 libcycript_la_SOURCES = Highlight.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp

-libcycript_la_LDFLAGS = -no-undefined $(LTLIBAPR) $(LTLIBICONV) -ldl
+libcycript_la_LDFLAGS = -no-undefined
+libcycript_la_LIBADD = $(LTLIBAPR) $(LTLIBFFI) $(LTLIBICONV) -ldl

 
 libcycript_la_SOURCES += Cycript.tab.cc
 libcycript_la_SOURCES += lex.cy.cpp
 
 bin_PROGRAMS = cycript
 cycript_SOURCES = Console.cpp Display.cpp
 
 libcycript_la_SOURCES += Cycript.tab.cc
 libcycript_la_SOURCES += lex.cy.cpp
 
 bin_PROGRAMS = cycript
 cycript_SOURCES = Console.cpp Display.cpp

-cycript_LDFLAGS = $(LTLIBAPR) $(LTLIBREADLINE) $(LTLIBTERMCAP) -ldl
-cycript_LDADD = libcycript.la
+cycript_LDADD = libcycript.la $(LTLIBAPR) $(LTLIBREADLINE) $(LTLIBTERMCAP) -ldl

 
 ldid = true
 entitle = $(ldid) -Scycript.xml
 
 ldid = true
 entitle = $(ldid) -Scycript.xml


@@ -49,14 +69,6 @@ endif
 if CY_OBJECTIVEC
 filters += ObjectiveC
 libcycript_la_SOURCES += ObjectiveC/Output.mm ObjectiveC/Replace.cpp ObjectiveC/Library.mm
 if CY_OBJECTIVEC
 filters += ObjectiveC
 libcycript_la_SOURCES += ObjectiveC/Output.mm ObjectiveC/Replace.cpp ObjectiveC/Library.mm

-
-ObjectiveC/Library.lo: Struct.hpp
-
-# XXX: this is not architecture-specific... isn't this just totally wrong?!
-# XXX: clang doesn't support this feature... that makes me really very sad.
-CLEANFILES += Struct.hpp
-Struct.hpp:
-       $$($(OBJCXX) -print-prog-name=cc1obj) -print-objc-runtime-info </dev/null >$@

 endif
 
 if CY_MACH
 endif
 
 if CY_MACH


@@ -92,7 +104,7 @@ 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;/' >$@
 

-Highlight.lo: Cycript.tab.hh
+Console.lo Execute.lo Highlight.lo Library.lo Parser.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
 
 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