Added CalEventIsAllDay to Bridge.def for Element.

[cycript.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index f1ecba5cbd11b670bb6eeeecb6d24d4ec8094be9..3fe159f2910c2993e42a6b4ee708b52a6d1b35f1 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -15,10 +15,12 @@ flex := @FLEX@
 libtool := @LIBTOOL@
 cxx := @CXX@
 objcxx := @OBJCXX@
-cflags := @CPPFLAGS@ @CXXFLAGS@ -DYYDEBUG=1
+cflags := @CPPFLAGS@ @CXXFLAGS@ -DYYDEBUG=1 @DEFS@
+objcxxflags := @OBJCXXFLAGS@
 ldflags := @LDFLAGS@
 library := @LIBS@ @LTLIBAPR@ @LTLIBICONV@
 time := $(shell which @TIME@)
+gperf := @GPERF@
 
 INSTALL := @INSTALL@
 INSTALL_PROGRAM := @INSTALL_PROGRAM@
@@ -47,6 +49,9 @@ libdir := @libdir@
 localedir := @localedir@
 mandir := @mandir@
 
+CY_EXECUTE := @CY_EXECUTE@
+CY_OBJECTIVEC := @CY_OBJECTIVEC@
+
 paths := $(foreach path,$(paths),$(wildcard $(path)))
 cflags += $(foreach path,$(paths),-I$(path) -L$(path))
 
@@ -81,15 +86,16 @@ restart ?= $(MAKE)
 uname_s ?= $(shell uname -s)
 uname_p ?= $(shell uname -p)
 
--include $(uname_s).mk
--include $(uname_s)-$(uname_p).mk
-
-ifdef CY_EXECUTE
-ifeq ($(filter ObjectiveC,$(filters)),)
-ifneq ($(shell which gnustep-config 2>/dev/null),)
-include GNUstep.mk
-endif
-endif
+ifeq ($(CY_EXECUTE),1)
+cflags += -DCY_EXECUTE
+code += sig/ffi_type.lo sig/parse.lo sig/copy.lo
+code += Execute.lo Bridge.lo
+filters += C
+#ifeq ($(filter ObjectiveC,$(filters)),)
+#ifneq ($(shell which gnustep-config 2>/dev/null),)
+#include GNUstep.mk
+#endif
+#endif
 endif
 
 cflags += -Wall -Werror -Wno-parentheses #-Wno-unused
@@ -99,7 +105,7 @@ cflags += -I.
 endif
 cflags += -I$(srcdir) -I$(srcdir)/include
 
-all += $(lib)cycript.la
+all += libcycript.la
 
 filters += $(shell bison <(echo '%code{}%%_:') -o/dev/null 2>/dev/null && echo Bison24 || echo Bison23)
 
@@ -138,10 +144,32 @@ $(deb): $(all) control
        dpkg-deb -b package $(deb)
 endif
 
+ifeq ($(CY_EXECUTE),1)
+Bridge.gperf: Bridge.def Bridge.sh
+       $(srcdir)/Bridge.sh $< >$@
+
+Bridge.hpp: Bridge.gperf
+       $(gperf) $< | sed -e 's/defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__/0/' >$@
+
+Bridge.lo: Bridge.hpp
+endif
+
+ifeq ($(CY_OBJECTIVEC),1)
+filters += ObjectiveC
+header += Struct.hpp ObjectiveC/Internal.hpp ObjectiveC/Syntax.hpp
+code += ObjectiveC/Output.lo ObjectiveC/Replace.lo ObjectiveC/Library.lo
+
+Struct.hpp:
+       $$($(objcxx) -print-prog-name=cc1obj) -print-objc-runtime-info </dev/null >$@
+endif
+
 all: $(all)
 
 clean::
-       rm -rf *.lo *.o .libs $(lib)cycript.$(dll) $(lib)cycript.la $(all) Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh cyrver Cycript.yy Cycript.l control Bridge.hpp Cycript.output
+       rm -rf *.lo *.o *.d .libs */*.lo */.libs libcycript.la $(all) Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh cyrver Cycript.yy Cycript.l control Bridge.gperf Bridge.hpp Cycript.output
+ifneq ($(srcdir),.)
+       rm -rf sig ObjectiveC
+endif
 
 distclean: clean
        rm -f GNUmakefile config.log config.status libtool
@@ -171,26 +199,30 @@ lex.cy.lo: lex.cy.c $(header)
        $(libtool) --mode=compile $(cxx) $(cflags) -c -o $@ $<
 
 %.lo: %.mm $(header)
-       $(libtool) --mode=compile $(objcxx) $(cflags) -c -o $@ $<
+       $(libtool) --mode=compile $(objcxx) $(objcxxflags) $(cflags) -c -o $@ $<
 
-$(lib)cycript.la: $(code)
+libcycript.la: $(code)
        $(libtool) --mode=link $(cxx) $(ldflags) -o $@ $(filter %.lo,$^) $(library) $(link) -rpath $(libdir)
        $(ldid) $@
 
-cycript: Console.lo $(lib)cycript.la $(inject)
-       $(libtool) --mode=link $(cxx) $(ldflags) -o $@ $(filter %.lo,$^) $(lib)cycript.la $(link) -rpath $(libdir)
+cycript: Console.lo libcycript.la $(inject)
+       $(libtool) --mode=link $(cxx) $(ldflags) -o $@ $(filter %.lo,$^) libcycript.la $(link) -rpath $(libdir)
        $(entitle) cycript
 
 package: $(deb)
 
-test: $(deb)
-       dpkg -i $(deb)
-       if [[ -e target.cy ]]; then cycript -c target.cy && echo; fi
-       if [[ -e jquery.js ]]; then $(time) cycript -c jquery.js >jquery.cyc.js; gzip -9c jquery.cyc.js >jquery.cyc.js.gz; wc -c jquery.{mam,gcc,cyc,bak,yui}.js; wc -c jquery.{cyc,gcc,bak,mam,yui}.js.gz; fi
-       if [[ -e test.cy ]]; then cycript test.cy; fi
+test: cycript
+       if [[ -e target.cy ]]; then ./cycript -c target.cy && echo; fi
+       if [[ -e jquery.js ]]; then $(time) ./cycript -c jquery.js >jquery.cyc.js; gzip -9c jquery.cyc.js >jquery.cyc.js.gz; wc -c jquery.{mam,gcc,cyc,bak,yui}.js; wc -c jquery.{cyc,gcc,bak,mam,yui}.js.gz; fi
+       if [[ -e test.cy ]]; then ./cycript test.cy; fi
+
+install: cycript libcycript.la
+       $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
+       $(libtool) --mode=install $(INSTALL_PROGRAM) libcycript.la $(DESTDIR)$(libdir)/libcycript.la
+       $(libtool) --mode=install $(INSTALL_PROGRAM) cycript $(DESTDIR)$(bindir)/cycript
 
-install: cycript $(lib)cycript.$(dll)
-       cp -p cycript /usr/bin
-       cp -p $(lib)cycript.$(dll) /usr/lib
+uninstall:
+       $(libtool) --mode=uninstall rm -f $(DESTDIR)$(bindir)/cycript
+       $(libtool) --mode=uninstall rm -f $(DESTDIR)$(libdir)/libcycript.la
 
-.PHONY: all clean extra package control.tmp
+.PHONY: all clean extra install uninstall package test control.tmp