fixed a Cocoa compile warning

[sope] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index c6ec2f189893b1686b0459943991fc14f372248e..16bbe891f076a5feda33b0acdbfa0ac6614f7a01 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,4 +1,13 @@
-# Note: could be that it may not fully compile 'inline'
+# GNUstep makefile
+
+-include ./config.make
+
+ifeq ($(GNUSTEP_MAKEFILES),)
+
+$(warning Note: Your $(GNUSTEP_MAKEFILES) environment variable is empty!)
+$(warning       Either use ./configure or source GNUstep.sh.)
+
+else
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
@@ -7,11 +16,40 @@ SUBPROJECTS += \
        sope-core       \
        sope-mime       \
        sope-appserver  \
-       sope-ldap       \
        sope-ical       \
        sope-gdl1       \
-       xmlrpc_call     \
+       xmlrpc_call
+
+ifeq ($(HAS_LIBRARY_ldap),yes)
+SUBPROJECTS += sope-ldap
+endif
+
+ifeq ($(FOUNDATION_LIB),apple)
+ifeq ($(frameworks),yes)
+SUBPROJECTS += sopex
+endif
+endif
+
 
 -include $(GNUSTEP_MAKEFILES)/GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/aggregate.make
 -include $(GNUSTEP_MAKEFILES)/GNUmakefile.postamble
+
+include ./Version
+
+endif
+
+distclean ::
+       if test -f config.make; then rm config.make; fi
+       if test -d .gsmake; then rm -r .gsmake; fi
+       if test -f config-NGStreams.log; then rm config-NGStreams.log; fi
+       if test -f config-gstepmake.log; then rm config-gstepmake.log; fi
+
+macosx-pkg ::
+       for i in $(SUBPROJECTS); do \
+         (cd $$i; $(MAKE) macosx-pkg); \
+       done
+       ./maintenance/make-osxmpkg.sh SOPE-$(MAJOR_VERSION).$(MINOR_VERSION)
+       
+macosx-dmg :: macosx-pkg
+       ./maintenance/make-osxdmg.sh SOPE-$(MAJOR_VERSION).$(MINOR_VERSION) osxpkgbuild "SOPE $(MAJOR_VERSION).$(MINOR_VERSION)"