some code cleanups

[sope] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index c5f4f7edbc425ac2875687e222c354e459003901..16bbe891f076a5feda33b0acdbfa0ac6614f7a01 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -24,12 +24,32 @@ 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)"