Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1806
Modified Files: Makefile Log Message: switched to old binary install command since the new one wasn't working in all contexts; replaced make commands with MAKE variables; added more to the zexy_clean target
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** Makefile 28 Sep 2006 20:34:10 -0000 1.93 --- Makefile 28 Sep 2006 23:53:49 -0000 1.94 *************** *** 476,480 ****
cyclone_clean: ! -make -C $(externals_src)/miXed/cyclone $(DEST_PATHS) clean
--- 476,480 ----
cyclone_clean: ! -$(MAKE) -C $(externals_src)/miXed/cyclone $(DEST_PATHS) clean
*************** *** 1480,1490 **** $(externals_src)/OSCx/src/OSCroute.$(EXTENSION): $(externals_src)/OSCx/configure \ $(externals_src)/OSCx/Makefile ! make -C $(externals_src)/OSCx $(externals_src)/OSCx/src/dumpOSC.$(EXTENSION): $(externals_src)/OSCx/configure \ $(externals_src)/OSCx/Makefile ! make -C $(externals_src)/OSCx $(externals_src)/OSCx/src/sendOSC.$(EXTENSION): $(externals_src)/OSCx/configure \ $(externals_src)/OSCx/Makefile ! make -C $(externals_src)/OSCx
oscx: $(externals_src)/OSCx/src/OSCroute.$(EXTENSION) \ --- 1480,1490 ---- $(externals_src)/OSCx/src/OSCroute.$(EXTENSION): $(externals_src)/OSCx/configure \ $(externals_src)/OSCx/Makefile ! $(MAKE) -C $(externals_src)/OSCx $(externals_src)/OSCx/src/dumpOSC.$(EXTENSION): $(externals_src)/OSCx/configure \ $(externals_src)/OSCx/Makefile ! $(MAKE) -C $(externals_src)/OSCx $(externals_src)/OSCx/src/sendOSC.$(EXTENSION): $(externals_src)/OSCx/configure \ $(externals_src)/OSCx/Makefile ! $(MAKE) -C $(externals_src)/OSCx
oscx: $(externals_src)/OSCx/src/OSCroute.$(EXTENSION) \ *************** *** 1504,1508 ****
oscx_clean: ! -cd $(externals_src)/OSCx && make $(DEST_PATHS) clean -cd $(externals_src)/OSCx && $(MAKE) CC=gcc clean -rm $(externals_src)/OSCx/Makefile --- 1504,1508 ----
oscx_clean: ! -cd $(externals_src)/OSCx && $(MAKE) $(DEST_PATHS) clean -cd $(externals_src)/OSCx && $(MAKE) CC=gcc clean -rm $(externals_src)/OSCx/Makefile *************** *** 1577,1581 ****
pddp_clean: ! -make -C $(externals_src)/mixed/pddp $(DEST_PATHS) clean
--- 1577,1581 ----
pddp_clean: ! -$(MAKE) -C $(externals_src)/mixed/pddp $(DEST_PATHS) clean
*************** *** 1624,1628 **** $(externals_src)/pdp/pdp.$(EXTENSION): $(externals_src)/pdp/configure \ $(externals_src)/pdp/Makefile.config ! make -C $(externals_src)/pdp PD_EXECUTABLE="$(pd_src)/bin/pd"
pdp: $(externals_src)/pdp/pdp.$(EXTENSION) --- 1624,1628 ---- $(externals_src)/pdp/pdp.$(EXTENSION): $(externals_src)/pdp/configure \ $(externals_src)/pdp/Makefile.config ! $(MAKE) -C $(externals_src)/pdp PD_EXECUTABLE="$(pd_src)/bin/pd"
pdp: $(externals_src)/pdp/pdp.$(EXTENSION) *************** *** 1666,1670 **** $(externals_src)/pidip/pidip.$(EXTENSION): $(externals_src)/pidip/configure \ $(externals_src)/pidip/Makefile ! -make -C $(externals_src)/pidip
pidip: $(externals_src)/pidip/pidip.$(EXTENSION) --- 1666,1670 ---- $(externals_src)/pidip/pidip.$(EXTENSION): $(externals_src)/pidip/configure \ $(externals_src)/pidip/Makefile ! -$(MAKE) -C $(externals_src)/pidip
pidip: $(externals_src)/pidip/pidip.$(EXTENSION) *************** *** 1854,1858 ****
toxy_clean: ! -make -C $(externals_src)/mixed/toxy $(DEST_PATHS) clean
--- 1854,1859 ----
toxy_clean: ! -$(MAKE) -C $(externals_src)/mixed/toxy $(DEST_PATHS) clean !
*************** *** 1992,1997 **** # Zexy ZEXY_NAME = zexy ! ZEXY_OBJECTS := $(wildcard $(externals_src)/zexy/src/[a-y0]*.c \ ! $(externals_src)/zexy/src/z~.c) ZEXY_VERSION := $(shell grep VERSION $(externals_src)/zexy/src/zexy.h | \ grep -v _VERSION | cut -d ' ' -f 3 | cut -d '"' -f 2) --- 1993,1998 ---- # Zexy ZEXY_NAME = zexy ! ZEXY_OBJECTS := $(wildcard $(externals_src)/zexy/src/[a-vxy0]*.c) \ ! $(externals_src)/zexy/src/wrap.c $(externals_src)/zexy/src/z~.c ZEXY_VERSION := $(shell grep VERSION $(externals_src)/zexy/src/zexy.h | \ grep -v _VERSION | cut -d ' ' -f 3 | cut -d '"' -f 2) *************** *** 2009,2013 ****
zexy: $(externals_src)/zexy/src/Make.config ! make -C $(externals_src)/zexy/src/
zexy_install: zexy --- 2010,2014 ----
zexy: $(externals_src)/zexy/src/Make.config ! $(MAKE) -C $(externals_src)/zexy/src/
zexy_install: zexy *************** *** 2018,2024 **** --description "GUI and streaming objects" \ --version "$(ZEXY_VERSION)" ! # install -p $(ZEXY_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(ZEXY_NAME) ! install -p $(wildcard $(externals_src)/zexy/src/*.$(EXTENSION)) \ ! $(objectsdir)/$(ZEXY_NAME) install -p $(shell ls -1 $(externals_src)/zexy/abs/*.pd | \ grep -v '-help.pd' | sed 's|(.*)|"\1"|g') \ --- 2019,2027 ---- --description "GUI and streaming objects" \ --version "$(ZEXY_VERSION)" ! install -p $(ZEXY_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(ZEXY_NAME) ! # the below doesn't work for some reason, probably because of some kind of ! # strange make execution order hans@at.or.at ! # install -p $(shell $(externals_src)/zexy/src/*.$(EXTENSION)) \ ! # $(objectsdir)/$(ZEXY_NAME) install -p $(shell ls -1 $(externals_src)/zexy/abs/*.pd | \ grep -v '-help.pd' | sed 's|(.*)|"\1"|g') \ *************** *** 2033,2037 **** --- 2036,2042 ----
zexy_clean: + -$(MAKE) -C $(externals_src)/zexy/src clean -rm -f -- $(ZEXY_OBJECTS:.c=.$(EXTENSION)) + -rm -f -- $(ZEXY_OBJECTS:.c=.d) -rm -rf -- $(externals_src)/zexy/src/autom4ate -rm -rf -- $(externals_src)/zexy/src/conf[0-9][0-9][0-9]*