[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11187] trunk/blender/release/Makefile: I cleaned up make release a little bit, now

[Kent Mein]

Revision: 11187
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11187
Author:   sirdude
Date:     2007-07-06 20:20:48 +0200 (Fri, 06 Jul 2007)

Log Message:
-----------
I cleaned up make release a little bit, now
its not hard coded if it trys to do a static build or not.  It
uses the same vars that decide if your building a static blender to
determine if it should make a static package.

I also found a typo on OSX for make release and thats fixed now

Kent

Modified Paths:
--------------
    trunk/blender/release/Makefile

Modified: trunk/blender/release/Makefile
===================================================================
--- trunk/blender/release/Makefile	2007-07-06 15:51:58 UTC (rev 11186)
+++ trunk/blender/release/Makefile	2007-07-06 18:20:48 UTC (rev 11187)
@@ -37,48 +37,52 @@
 export DISTDIR=$(NAN_OBJDIR)/$(BLENDNAME)
 export CONFDIR=$(DISTDIR)/.blender
 
+ifeq ($(OS),beos)
+   TAR="zip"
+   TARFLAGS="-ry9"
+   EXT0=""
+   EXT1=".zip"
+   COMPRESS=""
+   EXT2=""
+   NOPLUGINS="true"
+endif
 
+ifeq ($(OS),$(findstring $(OS), "freebsd irix linux openbsd solaris"))
+   TAR="tar"
+   TARFLAGS="cf"
+   EXT0=""
+   EXT1=".tar"
+   COMPRESS="bzip2"
+   COMPRESSFLAGS="-f"
+   EXT2=".bz2"
+endif
+
+ifeq ($(OS),windows)
+   TAR="zip"
+   TARFLAGS="-r9"
+   EXT0=".exe"
+   EXT1=".zip"
+   NOPLUGINS="true"
+   NOSTRIP="true"
+endif
+
+ifeq ($(OS),darwin)
+   TAR="tar"
+   TARFLAGS="cf"
+   EXT0=".app"
+   EXT1=".tar"
+   COMPRESS="bzip2"
+   COMPRESSFLAGS="-f"
+   EXT2=".bz2"
+endif
+
 release: all
 
 all:
-    ifeq ($(OS),beos)
-	@$(MAKE) pkg TYPE="" TAR="zip -ry9" EXT1=".zip" NOPLUGINS="true"
-    endif
-    ifeq ($(OS),freebsd)
-	@$(MAKE) pkg TYPE="" TAR="tar cf" EXT1=".tar" \
-	    COMPRESS="bzip2 -f" EXT2=".bz2"
-    endif
-    ifeq ($(OS),irix)
-	@$(MAKE) pkg TYPE="" TAR="tar cf" EXT1=".tar" \
-	    COMPRESS="bzip2 -f" EXT2=".bz2"
-    endif
-    ifeq ($(OS),linux)
-      ifeq ($(CPU),alpha)
-	@$(MAKE) pkg TYPE="" TAR="tar cf" EXT1=".tar" \
-	    COMPRESS="bzip2 -f" EXT2=".bz2"
-      else
-	@$(MAKE) pkg TYPE="" TAR="tar cf" EXT1=".tar" \
-	    COMPRESS="bzip2 -f" EXT2=".bz2"
-	@$(MAKE) pkg TYPE="-static" TAR="tar cf" EXT1=".tar" \
-	    COMPRESS="bzip2 -f" EXT2=".bz2"
-      endif
-    endif
-    ifeq ($(OS),openbsd)
-	@$(MAKE) pkg TYPE="-static" TAR="tar cf" EXT1=".tar" \
-	    COMPRESS="bzip2 -f" EXT2=".bz2"
-    endif
-    ifeq ($(OS),solaris)
-	@$(MAKE) pkg TYPE="" TAR="tar cf" EXT1=".tar" \
-	    COMPRESS="bzip2 -f" EXT2=".bz2"
-    endif
-    ifeq ($(OS),windows)
-	@$(MAKE) pkg TYPE="" TAR="zip -r9" EXT0=".exe" EXT1=".zip" \
-	    NOPLUGINS="true" NOSTRIP="true"
-    endif
-    ifeq ($(OS),darwin)
-	@$(MAKE) pkg TYPE="" TAR="tar cf" EXT0"=.app" EXT1=".tar" \
-	    COMPRESS="bzip2 -f" EXT2=".bz2"
-    endif
+	@$(MAKE) pkg TYPE=""
+ifeq ($(WITH_BF_STATICOPENGL), true)
+	@$(MAKE) pkg TYPE="-static" 
+endif
 
 # OS independent targets below:
 
@@ -178,12 +182,11 @@
 	@echo "----> Create distribution file $(BLENDNAME)$(EXT1)"
 	@#enable the next sleep if you get 'tar file changed while reading'
 	@#sleep 10
-	@cd $(NAN_OBJDIR) && \
-	rm -f  $(VERSION)/$(BLENDNAME)$(EXT1)* && \
-	$(TAR) $(VERSION)/$(BLENDNAME)$(EXT1) $(BLENDNAME)
+	rm -f  $(NAN_OBJDIR)/$(VERSION)/$(BLENDNAME)$(EXT1)*
+	@cd $(NAN_OBJDIR) && $(TAR) $(TARFLAGS) $(VERSION)/$(BLENDNAME)$(EXT1) $(BLENDNAME)
     ifdef COMPRESS
 	@echo "----> Compressing distribution to $(BLENDNAME)$(EXT1)$(EXT2)"
-	@$(COMPRESS) $(NAN_OBJDIR)/$(VERSION)/$(BLENDNAME)$(EXT1)
+	@$(COMPRESS) $(COMPRESSFLAGS) $(NAN_OBJDIR)/$(VERSION)/$(BLENDNAME)$(EXT1)
     endif
 	@#echo "****> Clean up temporary distribution directory"
 	@rm -fr $(DISTDIR)