forked from bartvdbraak/blender
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".
This commit is contained in:
parent
9b81d8f84c
commit
6275dd5b14
2
Makefile
2
Makefile
@ -45,7 +45,7 @@ sinclude user-def.mk
|
|||||||
export NANBLENDERHOME=$(shell pwd)
|
export NANBLENDERHOME=$(shell pwd)
|
||||||
MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
|
MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
|
||||||
|
|
||||||
SOURCEDIR = blender
|
SOURCEDIR =
|
||||||
ifeq ($(FREE_WINDOWS),true)
|
ifeq ($(FREE_WINDOWS),true)
|
||||||
DIRS ?= dlltool extern intern source po
|
DIRS ?= dlltool extern intern source po
|
||||||
endif
|
endif
|
||||||
|
1
extern/solid/Makefile
vendored
1
extern/solid/Makefile
vendored
@ -33,6 +33,7 @@
|
|||||||
|
|
||||||
include nan_definitions.mk
|
include nan_definitions.mk
|
||||||
|
|
||||||
|
SOURCEDIR = extern/solid
|
||||||
LIBNAMES = solid solid_broad solid_convex solid_complex
|
LIBNAMES = solid solid_broad solid_convex solid_complex
|
||||||
DIR = $(OCGDIR)/extern/
|
DIR = $(OCGDIR)/extern/
|
||||||
DIRS = src
|
DIRS = src
|
||||||
|
1
extern/solid/src/Makefile
vendored
1
extern/solid/src/Makefile
vendored
@ -31,6 +31,7 @@
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|
||||||
|
SOURCEDIR = extern/solid/src
|
||||||
LIBNAME = solid
|
LIBNAME = solid
|
||||||
DIR = $(OCGDIR)/extern/$(LIBNAME)
|
DIR = $(OCGDIR)/extern/$(LIBNAME)
|
||||||
DIRS = broad complex convex
|
DIRS = broad complex convex
|
||||||
|
@ -32,6 +32,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
LIBNAME = logic
|
LIBNAME = logic
|
||||||
|
SOURCEDIR = source/gameengine/gameengine/GameLogic
|
||||||
DIR = $(OCGDIR)/gameengine/$(LIBNAME)
|
DIR = $(OCGDIR)/gameengine/$(LIBNAME)
|
||||||
DIRS = Joystick
|
DIRS = Joystick
|
||||||
|
|
||||||
|
@ -1,9 +1,37 @@
|
|||||||
#
|
#
|
||||||
# $Id$
|
# $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
|
DIRS = src
|
||||||
|
|
||||||
include nan_subdirs.mk
|
include nan_subdirs.mk
|
||||||
|
@ -31,6 +31,7 @@
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|
||||||
|
SOURCEDIR = source/gameengine/Physics/Sumo
|
||||||
LIBNAME = sumo
|
LIBNAME = sumo
|
||||||
DIR = $(OCGDIR)/gameengine/blphys/$(LIBNAME)
|
DIR = $(OCGDIR)/gameengine/blphys/$(LIBNAME)
|
||||||
DIRS = Fuzzics
|
DIRS = Fuzzics
|
||||||
|
@ -56,10 +56,17 @@ else
|
|||||||
@# Create object directory
|
@# Create object directory
|
||||||
@[ -d $(DIR) ] || mkdir -p $(DIR)
|
@[ -d $(DIR) ] || mkdir -p $(DIR)
|
||||||
endif
|
endif
|
||||||
|
ifdef SOURCEDIR
|
||||||
@for i in $(DIRS); do \
|
@for i in $(DIRS); do \
|
||||||
echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\
|
echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\
|
||||||
$(MAKE) -C $$i $@ || exit 1; \
|
$(MAKE) -C $$i $@ || exit 1; \
|
||||||
done
|
done
|
||||||
|
else
|
||||||
|
@for i in $(DIRS); do \
|
||||||
|
echo "====> $(MAKE) $@ in $$i" ;\
|
||||||
|
$(MAKE) -C $$i $@ || exit 1; \
|
||||||
|
done
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
test::
|
test::
|
||||||
|
Loading…
Reference in New Issue
Block a user