Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile34
-rw-r--r--extern/ode/Makefile3
-rw-r--r--intern/python/freeze/Makefile3
-rw-r--r--source/Makefile2
4 files changed, 40 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f6908f88470..04f2e56ee05 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,35 @@
-# toplevel Makefile for blender
+# $Id$
+#
+# ***** 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) 2002 by Wouter van Heyst
+# All rights reserved.
+#
+# The Original Code is: revision 1.1
+#
+# Contributor(s): Hans Lambermont
+#
+# ***** END GPL/BL DUAL LICENSE BLOCK *****
+#
+# Toplevel Makefile for blender. Bounces make to subdirectories.
+# Available targets: 'all' 'debug' 'release'
export NANBLENDERHOME=$(shell pwd)
MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
@@ -11,3 +42,4 @@ include source/nan_subdirs.mk
release:
@echo "====> $(MAKE) $@ in $(SOURCEDIR)/$@" ;\
$(MAKE) -C $@ $@ || exit 1;
+
diff --git a/extern/ode/Makefile b/extern/ode/Makefile
index 36128208049..1479dfcfc32 100644
--- a/extern/ode/Makefile
+++ b/extern/ode/Makefile
@@ -54,6 +54,9 @@ all:
mv $(TEMPSETTINGS) $(USERSETTINGS)
endif
+# fake debug target
+debug:
+
install: all
ifeq ($(OS),$(findstring $(OS), "freebsd linux"))
[ -d $(LCGDIR) ] || mkdir $(LCGDIR)
diff --git a/intern/python/freeze/Makefile b/intern/python/freeze/Makefile
index 3fe2f2a3f96..a606b942e04 100644
--- a/intern/python/freeze/Makefile
+++ b/intern/python/freeze/Makefile
@@ -12,6 +12,9 @@ PYFLAGS = -S -O
default: importer
+# fake all and debug targets
+all debug: default
+
install: importer
importer:
diff --git a/source/Makefile b/source/Makefile
index 5cc69f41b20..c8669761d45 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -84,7 +84,7 @@ PYPLAYERLIB ?= $(PYLIB)
GRPLIB += $(OCGDIR)/blender/renderconverter/$(DEBUG_DIR)librenderconverter.a
GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a
GRPLIB += $(OCGDIR)/blender/bpython/$(DEBUG_DIR)libbpython.a
- GRPLIB += $(OCGDIR)/blender/bpython/$(DEBUG_DIR)libfrozen.a
+ GRPLIB += $(OCGDIR)/blender/bpython/libfrozen.a
# nlin: the reason that some libraries appear more than once below is
# to handle circular dependencies in linking among libraries... some