Moved the compiling plugins to after the binary is copied over.

(macosX needs the binary to link against for the plugins)

Also updated the plugins/Makefile to use
$(MAKE) -C dir
	instead of
cd dir; make

Kent
This commit is contained in:
Kent Mein
2003-04-30 17:18:34 +00:00
parent 4a3d4472b1
commit abd2a37f8a
2 changed files with 12 additions and 12 deletions

View File

@@ -104,14 +104,6 @@ install: package
#@cp -r python $(DISTDIR)/python
#@rm -fr $(DISTDIR)/python/CVS
ifneq ($(NOPLUGINS),true)
@echo "----> Copy and compile plugins"
@cp -r plugins $(DISTDIR)/plugins
@chmod 755 $(DISTDIR)/plugins/bmake
@$(MAKE) -C $(DISTDIR)/plugins all > /dev/null || exit 1;
@rm -fr $(DISTDIR)/plugins/CVS $(DISTDIR)/plugins/*/CVS \
$(DISTDIR)/plugins/*/*.o
endif
@echo "----> Copy blender$(EXT0) executable"
ifeq ($(TYPE),-static)
@cp $(OCGDIR)/bin/blenderstatic$(EXT0) $(DISTDIR)/blender$(EXT0)
@@ -122,6 +114,14 @@ install: package
@cp $(OCGDIR)/bin/blender$(EXT0) $(DISTDIR)/blender$(EXT0)
endif
endif
ifneq ($(NOPLUGINS),true)
@echo "----> Copy and compile plugins"
@cp -r plugins $(DISTDIR)/plugins
@chmod 755 $(DISTDIR)/plugins/bmake
@$(MAKE) -C $(DISTDIR)/plugins all > /dev/null || exit 1;
@rm -fr $(DISTDIR)/plugins/CVS $(DISTDIR)/plugins/*/CVS \
$(DISTDIR)/plugins/*/*.o
endif
ifneq ($(NOSTRIP),true)
@echo "----> Strip blender executable"
ifeq ($(OS),darwin)

View File

@@ -32,11 +32,11 @@
all: textures sequences
textures:
cd texture; make;
$(MAKE) -C texture
sequences:
cd sequence; make;
$(MAKE) -C sequence
clean:
cd texture; make clean;
cd sequence; make clean;
$(MAKE) -C texture clean
$(MAKE) -C sequence clean