- glue top level makefile and release one together
authorHans Lambermont <hans@lambermont.dyndns.org>
Tue, 11 Feb 2003 12:35:18 +0000 (12:35 +0000)
committerHans Lambermont <hans@lambermont.dyndns.org>
Tue, 11 Feb 2003 12:35:18 +0000 (12:35 +0000)
- fix 8 spaces problem in release/Makefile

Makefile
release/Makefile

index 58770c7c1f7778ba367b4bf88a7449f740996e1f..f6908f88470baa9707428216e46edec17458400f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,12 @@
 
 export NANBLENDERHOME=$(shell pwd)
 MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
-include source/nan_subdirs.mk
 
 SOURCEDIR = blender
 DIRS = extern intern source
+include source/nan_subdirs.mk
+
+.PHONY: release
+release:
+       @echo "====> $(MAKE) $@ in $(SOURCEDIR)/$@" ;\
+           $(MAKE) -C $@ $@ || exit 1;
index f6d5a7c4c89b585d82b3fb645af6aa5f5bab9eac..96dd09a208c4698be979684bd4169a5050a4f70f 100644 (file)
@@ -36,6 +36,8 @@ export VERSION := $(shell cat VERSION)
 BLENDNAME=blender-$(VERSION)-$(CONFIG_GUESS)$(TYPE)
 export DISTDIR=$(NAN_OBJDIR)/$(BLENDNAME)
 
+release: all
+
 all:
     ifeq ($(OS),beos)
        @$(MAKE) pkg TYPE="" TAR="zip -ry9" EXT1=".zip" NOPLUGINS="true"
@@ -114,19 +116,19 @@ install: package
     ifeq ($(TYPE),-static)
        @cp $(OCGDIR)/bin/blenderstatic$(EXT0) $(DISTDIR)/blender$(EXT0)
     else
-        ifeq ($(OS),darwin)
-           @cp -r $(OCGDIR)/bin/blender$(EXT0) $(DISTDIR)/blender$(EXT0)
-        else
-           @cp $(OCGDIR)/bin/blender$(EXT0) $(DISTDIR)/blender$(EXT0)
-        endif
+    ifeq ($(OS),darwin)
+       @cp -r $(OCGDIR)/bin/blender$(EXT0) $(DISTDIR)/blender$(EXT0)
+    else
+       @cp $(OCGDIR)/bin/blender$(EXT0) $(DISTDIR)/blender$(EXT0)
+    endif
     endif
     ifneq ($(NOSTRIP),true)
        @echo "----> Strip blender executable"
-        ifeq ($(OS),darwin)
-           @strip $(OCGDIR)/bin/blender$(EXT0)/Contents/MacOS/blender
-        else
-           @strip $(DISTDIR)/blender$(EXT0)
-        endif
+      ifeq ($(OS),darwin)
+       @strip $(OCGDIR)/bin/blender$(EXT0)/Contents/MacOS/blender
+      else
+       @strip $(DISTDIR)/blender$(EXT0)
+      endif
     endif
        @[ ! -x $(CONFIG_GUESS)/specific.sh ] || (\
            echo "**--> Execute specific.sh in $(CONFIG_GUESS)/" && \