diff options
author | Chris Want <cwant@ualberta.ca> | 2005-04-10 02:40:34 +0400 |
---|---|---|
committer | Chris Want <cwant@ualberta.ca> | 2005-04-10 02:40:34 +0400 |
commit | 6275dd5b14e94f06e73bc97ed5ee244f215fffeb (patch) | |
tree | 535dd29f44af23196261761241397361d0242da3 | |
parent | 9b81d8f84cb50d67dfe86a0c65814f568f80f2f8 (diff) |
Clean up for Makefiles: some of the directories were being printed
wrong (e.g., "/Fuzzics" and "/Joystick", and some of the solid stuff).
This was particularly noticable during "make clean".
-rw-r--r-- | Makefile | 2 | ||||
-rwxr-xr-x | extern/solid/Makefile | 1 | ||||
-rw-r--r-- | extern/solid/src/Makefile | 1 | ||||
-rw-r--r-- | source/gameengine/GameLogic/Makefile | 1 | ||||
-rw-r--r-- | source/gameengine/Physics/Sumo/Fuzzics/Makefile | 34 | ||||
-rw-r--r-- | source/gameengine/Physics/Sumo/Makefile | 1 | ||||
-rw-r--r-- | source/nan_subdirs.mk | 7 |
7 files changed, 43 insertions, 4 deletions
@@ -45,7 +45,7 @@ sinclude user-def.mk export NANBLENDERHOME=$(shell pwd) MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory -SOURCEDIR = blender +SOURCEDIR = ifeq ($(FREE_WINDOWS),true) DIRS ?= dlltool extern intern source po endif diff --git a/extern/solid/Makefile b/extern/solid/Makefile index 5aa99be5743..ed5a1359cf4 100755 --- a/extern/solid/Makefile +++ b/extern/solid/Makefile @@ -33,6 +33,7 @@ include nan_definitions.mk +SOURCEDIR = extern/solid LIBNAMES = solid solid_broad solid_convex solid_complex DIR = $(OCGDIR)/extern/ DIRS = src diff --git a/extern/solid/src/Makefile b/extern/solid/src/Makefile index 451431ced3b..b45a1da9cd3 100644 --- a/extern/solid/src/Makefile +++ b/extern/solid/src/Makefile @@ -31,6 +31,7 @@ # # +SOURCEDIR = extern/solid/src LIBNAME = solid DIR = $(OCGDIR)/extern/$(LIBNAME) DIRS = broad complex convex diff --git a/source/gameengine/GameLogic/Makefile b/source/gameengine/GameLogic/Makefile index 9e6f4515bad..eab4e7faa7e 100644 --- a/source/gameengine/GameLogic/Makefile +++ b/source/gameengine/GameLogic/Makefile @@ -32,6 +32,7 @@ # LIBNAME = logic +SOURCEDIR = source/gameengine/gameengine/GameLogic DIR = $(OCGDIR)/gameengine/$(LIBNAME) DIRS = Joystick diff --git a/source/gameengine/Physics/Sumo/Fuzzics/Makefile b/source/gameengine/Physics/Sumo/Fuzzics/Makefile index d721a416862..557be7a1bd4 100644 --- a/source/gameengine/Physics/Sumo/Fuzzics/Makefile +++ b/source/gameengine/Physics/Sumo/Fuzzics/Makefile @@ -1,9 +1,37 @@ # # $Id$ -# Copyright (C) 2001 NaN Technologies B.V. -# Bounce make to subdirectories. +# +# ***** BEGIN GPL/BL DUAL 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. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): none yet. +# +# ***** END GPL/BL DUAL LICENSE BLOCK ***** +# +# Bounces make to subdirectories. -SOURCEDIR = source/sumo/Fuzzics +SOURCEDIR = source/gameengine/Physics/Sumo/Fuzzics DIRS = src include nan_subdirs.mk diff --git a/source/gameengine/Physics/Sumo/Makefile b/source/gameengine/Physics/Sumo/Makefile index eef7ee3b40d..bc1300c1994 100644 --- a/source/gameengine/Physics/Sumo/Makefile +++ b/source/gameengine/Physics/Sumo/Makefile @@ -31,6 +31,7 @@ # # +SOURCEDIR = source/gameengine/Physics/Sumo LIBNAME = sumo DIR = $(OCGDIR)/gameengine/blphys/$(LIBNAME) DIRS = Fuzzics diff --git a/source/nan_subdirs.mk b/source/nan_subdirs.mk index f1d730e5cd1..aab88cc292b 100644 --- a/source/nan_subdirs.mk +++ b/source/nan_subdirs.mk @@ -56,10 +56,17 @@ else @# Create object directory @[ -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:: |