Further improvements to the autoconf scripting.

[cycript.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index fd532830b1ce98c8eb0098b90ea8ece60b5cfe04..46d5c2fd083dd6aa8e96eb0defd45c293d879235 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -109,7 +109,7 @@ filters += C
 header += JavaScript.hpp
 endif
 
 header += JavaScript.hpp
 endif
 

-cflags := -Wall -Werror -Wno-parentheses $(cflags)
+cflags += -Werror

 cflags += -fno-common
 ifneq ($(srcdir),.)
 cflags += -I.
 cflags += -fno-common
 ifneq ($(srcdir),.)
 cflags += -I.


@@ -169,8 +169,9 @@ code += ObjectiveC/Output.lo ObjectiveC/Replace.lo ObjectiveC/Library.lo
 
 Struct.hpp:
        $$($(objcxx) -print-prog-name=cc1obj) -print-objc-runtime-info </dev/null >$@
 
 Struct.hpp:
        $$($(objcxx) -print-prog-name=cc1obj) -print-objc-runtime-info </dev/null >$@

+endif

 
 

-ifeq ($(CY_OBJECTIVEC_MACH),1)
+ifeq ($(CY_MACH),1)

 code += Handler.lo
 cflags += -DCY_ATTACH -DCY_LIBRARY='"$(libdir)/libcycript.$(dll)"'
 inject += Mach/Inject.lo
 code += Handler.lo
 cflags += -DCY_ATTACH -DCY_LIBRARY='"$(libdir)/libcycript.$(dll)"'
 inject += Mach/Inject.lo


@@ -183,7 +184,6 @@ Mach/Inject.lo: Trampoline.t.hpp Baton.hpp
 %.t.hpp: %.t.lo trampoline.sh
        $(srcdir)/trampoline.sh $@ .libs/lib$*.t.$(dll) $* $(sed) $(otool) $(lipo) $(nm) $(libtool) --mode=link $(cxx) $(ldflags) -o lib$*.t.la $< -rpath $(libdir) -Xcompiler -nostdlib
 endif
 %.t.hpp: %.t.lo trampoline.sh
        $(srcdir)/trampoline.sh $@ .libs/lib$*.t.$(dll) $* $(sed) $(otool) $(lipo) $(nm) $(libtool) --mode=link $(cxx) $(ldflags) -o lib$*.t.la $< -rpath $(libdir) -Xcompiler -nostdlib
 endif

-endif

 
 all: $(all)
 
 
 all: $(all)