Remove redundant include GL/glu.h in KX_Dome.cpp.

[blender.git] / source / nan_subdirs.mk

diff --git a/source/nan_subdirs.mk b/source/nan_subdirs.mk
index bdd645c61440672d9603759d5e7a5dec727f7408..85360eab7bc19ae39be5a03765cf0f7443872a29 100644 (file)
--- a/source/nan_subdirs.mk
+++ b/source/nan_subdirs.mk
@@ -1,15 +1,12 @@
 #
 # $Id$
 #
-# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+# ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version. The Blender
-# Foundation also sells licenses for use in proprietary software under
-# the Blender License.  See http://www.blender.org/BL/ for information
-# about this.
+# of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,7 +24,7 @@
 #
 # Contributor(s): none yet.
 #
-# ***** END GPL/BL DUAL LICENSE BLOCK *****
+# ***** END GPL LICENSE BLOCK *****
 #
 # Bounce make to subdirectories.
 # Set DIRS, SOURCEDIR. Optionally also reacts on DIR, TESTDIRS.
@@ -48,18 +45,25 @@ ifdef quicky
 else
     ifdef DIR
        @# Make sure object toplevels are there
-       @[ -d $(NAN_OBJDIR) ] || mkdir $(NAN_OBJDIR)
-       @[ -d $(LCGDIR) ] || mkdir $(LCGDIR)
-       @[ -d $(OCGDIR) ] || mkdir $(OCGDIR)
-       @[ -d $(OCGDIR)/intern ] || mkdir $(OCGDIR)/intern
-       @[ -d $(OCGDIR)/extern ] || mkdir $(OCGDIR)/extern
+       @[ -d $(NAN_OBJDIR) ] || mkdir -p $(NAN_OBJDIR)
+       @[ -d $(LCGDIR) ] || mkdir -p $(LCGDIR)
+       @[ -d $(OCGDIR) ] || mkdir -p $(OCGDIR)
+       @[ -d $(OCGDIR)/intern ] || mkdir -p $(OCGDIR)/intern
+       @[ -d $(OCGDIR)/extern ] || mkdir -p $(OCGDIR)/extern
        @# Create object directory
-       @[ -d $(DIR) ] || mkdir $(DIR)
+       @[ -d $(DIR) ] || mkdir -p $(DIR)
     endif
+    ifdef SOURCEDIR
        @for i in $(DIRS); do \
            echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\
            $(MAKE) -C $$i $@ || exit 1; \
        done
+    else
+       @for i in $(DIRS); do \
+           echo "====> $(MAKE) $@ in $$i" ;\
+           $(MAKE) -C $$i $@ || exit 1; \
+       done
+    endif
 endif
 
 test::