Update of /cvsroot/pure-data/packages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15806
Modified Files: Makefile Makefile.buildlayout Log Message: Makefile tune ups and clean ups, hopefully to allow things to build faster, especially when using make -j
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Makefile 22 Sep 2006 11:13:22 -0000 1.45 --- Makefile 28 Sep 2006 03:52:47 -0000 1.46 *************** *** 10,14 **** CWD := $(shell pwd)
! cvs_root_dir = $(CWD)/.. DESTDIR = $(CWD)/build BUILDLAYOUT_DIR = $(CWD) --- 10,14 ---- CWD := $(shell pwd)
! cvs_root_dir := $(shell cd $(CWD)/.. && pwd) DESTDIR = $(CWD)/build BUILDLAYOUT_DIR = $(CWD) *************** *** 116,120 **** # externals externals: ! cd $(externals_src) && make $(DEST_PATHS)
--- 116,120 ---- # externals externals: ! $(MAKE) -C $(externals_src) $(DEST_PATHS)
*************** *** 302,311 **** # abstractions_install abstractions_install: ! make -C $(abstractions_src) $(DEST_PATHS) install
#------------------------------------------------------------------------------ # doc_install doc_install: ! make -C $(doc_src) $(DEST_PATHS) install
--- 302,311 ---- # abstractions_install abstractions_install: ! $(MAKE) -C $(abstractions_src) $(DEST_PATHS) install
#------------------------------------------------------------------------------ # doc_install doc_install: ! $(MAKE) -C $(doc_src) $(DEST_PATHS) install
*************** *** 313,317 **** # extensions_install extensions_install: ! make -C $(extensions_src) $(DEST_PATHS) install
--- 313,317 ---- # extensions_install extensions_install: ! $(MAKE) -C $(extensions_src) $(DEST_PATHS) install
*************** *** 319,323 **** # externals_install externals_install: ! make -C $(externals_src) $(DEST_PATHS) install
--- 319,323 ---- # externals_install externals_install: ! $(MAKE) -C $(externals_src) $(DEST_PATHS) install
*************** *** 479,483 **** cd $(gem_src)/src && autoconf cd $(gem_src)/src && ./configure --without-ffmpeg --with-pd=$(pd_src) ! make -C $(gem_src)/src
$(gem_src)/src/Gem.pd_darwin: $(gem_src)/src/configure --- 479,483 ---- cd $(gem_src)/src && autoconf cd $(gem_src)/src && ./configure --without-ffmpeg --with-pd=$(pd_src) ! $(MAKE) -C $(gem_src)/src
$(gem_src)/src/Gem.pd_darwin: $(gem_src)/src/configure *************** *** 486,490 **** cd $(gem_src)/src && autoconf cd $(gem_src)/src && ./configure --without-ImageMagick --with-pd=$(pd_src) ! make -C $(gem_src)/src
gem: $(gem_src)/src/Gem.$(EXTENSION) --- 486,490 ---- cd $(gem_src)/src && autoconf cd $(gem_src)/src && ./configure --without-ImageMagick --with-pd=$(pd_src) ! $(MAKE) -C $(gem_src)/src
gem: $(gem_src)/src/Gem.$(EXTENSION) *************** *** 527,531 **** PD_NAME=Pd pd_install: pd ! make -C $(pd_src)/src $(DEST_PATHS) $(PD_BUILD_FLAGS) install install -d $(manualsdir)/$(PD_NAME) install -p $(pd_src)/src/notes.txt $(manualsdir)/$(PD_NAME) --- 527,531 ---- PD_NAME=Pd pd_install: pd ! $(MAKE) -C $(pd_src)/src $(DEST_PATHS) $(PD_BUILD_FLAGS) install install -d $(manualsdir)/$(PD_NAME) install -p $(pd_src)/src/notes.txt $(manualsdir)/$(PD_NAME) *************** *** 786,793 **** --- 786,795 ---- done # apply all platform-specific patches + ifneq ($(OS_NAME),windows) for patch in $(shell ls -1 $(CWD)/patches/$(OS_NAME)/*.patch); do \ echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 < $$patch; \ done + endif -rm -f -- $(pd_src)/src/configure $(pd_src)/src/makefile # change Pd's version number to reflect the extended build *************** *** 870,874 **** #==============================================================================# abstractions_clean: ! -cd $(abstractions_src) && make $(DEST_PATHS) clean
--- 872,876 ---- #==============================================================================# abstractions_clean: ! -$(MAKE) -C $(abstractions_src) $(DEST_PATHS) clean
*************** *** 877,881 ****
externals_clean: ! -cd $(externals_src) && make $(DEST_PATHS) clean
--- 879,883 ----
externals_clean: ! -$(MAKE) -C $(externals_src) $(DEST_PATHS) clean
*************** *** 893,897 ****
pd_clean: ! -cd $(pd_src)/src && make $(DEST_PATHS) clean
--- 895,899 ----
pd_clean: ! -$(MAKE) $(pd_src)/src $(DEST_PATHS) clean
*************** *** 903,911 ****
distclean: clean cruft_clean ! make -C $(abstractions_src) distclean ! make -C $(doc_src) distclean ! make -C $(extensions_src) distclean ! make -C $(externals_src) distclean ! -make -C $(pd_src) distclean
test_locations: --- 905,913 ----
distclean: clean cruft_clean ! $(MAKE) -C $(abstractions_src) distclean ! $(MAKE) -C $(doc_src) distclean ! $(MAKE) -C $(extensions_src) distclean ! $(MAKE) -C $(externals_src) distclean ! -$(MAKE) -C $(pd_src) distclean
test_locations:
Index: Makefile.buildlayout =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile.buildlayout,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Makefile.buildlayout 25 Jul 2006 02:13:30 -0000 1.27 --- Makefile.buildlayout 28 Sep 2006 03:52:47 -0000 1.28 *************** *** 41,58 **** OS_NAME = linux EXTENSION = pd_linux ! else ! ifeq ($(UNAME),Darwin) ! OS_NAME = darwin ! EXTENSION = pd_darwin ! else ! ifeq (MINGW,$(findstring MINGW,$(UNAME))) ! OS_NAME = windows ! EXTENSION = dll ! else ! OS_NAME = unknown ! EXTENSION = so ! $(warning WARNING: unknown environment "$(UNAME)".) ! endif ! endif endif
--- 41,56 ---- OS_NAME = linux EXTENSION = pd_linux ! endif ! ifeq ($(UNAME),Darwin) ! OS_NAME = darwin ! EXTENSION = pd_darwin ! endif ! ifeq (MINGW,$(findstring MINGW,$(UNAME))) ! OS_NAME = windows ! EXTENSION = dll ! endif ! ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME))) ! OS_NAME = windows ! EXTENSION = dll endif