Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5300

Modified Files: Makefile Log Message: cleaned up iemlib objects target a bit and got creb compiling. Waiting on some changes from Tom before everything with creb gets ironed out

Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** Makefile 11 Apr 2006 16:44:45 -0000 1.51 --- Makefile 12 Apr 2006 00:51:48 -0000 1.52 *************** *** 288,305 **** # CREB CREB_NAME=creb ! # ead* don't compile yet... ! CREB_OBJECTS := $(wildcard $(externals_src)/creb/modules/[a-df-z]*.c) # haven't figured these out yet #CREB_CXXOBJECTS := $(wildcard $(externals_src)/creb/modules++/*.cc)

! # kludge to make objects find the headers ! pre_creb: ! test -e $(externals_src)/creb/modules/extlib_util.h || \ ! ( cd $(externals_src)/creb/modules && ln -s ../include/extlib_util.h ) ! test -e $(externals_src)/creb/modules/filters.h || \ ! ( cd $(externals_src)/creb/modules && ln -s ../include/filters.h )

! creb: pre_creb $(CREB_CXXOBJECTS:.cc=.$(EXTENSION)) \ ! $(CREB_OBJECTS:.c=.$(EXTENSION))

creb_install: creb --- 288,310 ---- # CREB CREB_NAME=creb ! # ead* are compiled separately ! CREB_OBJECTS := $(wildcard $(externals_src)/creb/modules/[a-df-z]*.c) \ ! $(externals_src)/creb/modules/eblosc.c # haven't figured these out yet #CREB_CXXOBJECTS := $(wildcard $(externals_src)/creb/modules++/*.cc)

! # these are built separately since they made from a number of files ! CREB_EA_OBJECTS = $(wildcard $(externals_src)/creb/modules/ea*.c) ! CREB_ENVELOPE_UTIL = $(externals_src)/creb/system/envelope_util.c ! $(CREB_OBJECTS:.c=.o): ! $(CREB_ENVELOPE_UTIL:.c=.o): ! $(CC) $(CFLAGS) -I$(externals_src)/creb/include -o $*.o -c $*.c

! $(patsubst %.c,%~.$(EXTENSION),$(CREB_EA_OBJECTS)): $(CREB_ENVELOPE_UTIL:.c=.o) ! $(CC) $(LDFLAGS) -o $*.$(EXTENSION) $(CREB_ENVELOPE_UTIL:.c=.o) $(LIBS) ! chmod a-x $*.$(EXTENSION) ! ! creb: $(patsubst %.c,%~.$(EXTENSION),$(CREB_EA_OBJECTS)) \ ! $(CREB_OBJECTS:.c=.$(EXTENSION)) $(CREB_CXXOBJECTS:.cc=.$(EXTENSION))

creb_install: creb *************** *** 321,330 ****

creb_clean: ! -rm -f -- $(externals_src)/creb/*/*.$(EXTENSION) ! -rm -f -- $(externals_src)/creb/*/*.o -rm -f -- $(externals_src)/creb/*/*.bak -rm -f -- $(externals_src)/creb/*/*.*~ - -rm -f -- $(externals_src)/creb/modules/filters.h - -rm -f -- $(externals_src)/creb/modules/extlib_util.h

--- 326,336 ----

creb_clean: ! -rm -f -- $(CREB_OBJECTS:.c=.$(EXTENSION)) ! -rm -f -- $(CREB_ENVELOPE_UTIL:.c=.$(EXTENSION)) ! -rm -f -- $(CREB_EA_OBJECTS:.c=.$(EXTENSION)) ! -rm -f -- $(CREB_OBJECTS:.c=.o) ! -rm -f -- $(CREB_ENVELOPE_UTIL:.c=.o) $(CREB_EA_OBJECTS:.c=.o) -rm -f -- $(externals_src)/creb/*/*.bak -rm -f -- $(externals_src)/creb/*/*.*~

*************** *** 667,674 **** # IEMLIB IEMLIB_NAME=iemlib ! IEMLIB_OBJECTS := $(wildcard $(externals_src)/iemlib/src/iem_t3_lib/[st]*.c) \ ! $(wildcard $(externals_src)/iemlib/src/iem_mp3/[a-hj-z]*.c) \ ! $(wildcard $(externals_src)/iemlib/src/iemlib1/[a-hj-z]*.c) \ ! $(wildcard $(externals_src)/iemlib/src/iemlib2/[a-hj-z]*.c) iemlib: $(IEMLIB_OBJECTS:.c=.$(EXTENSION))

--- 673,677 ---- # IEMLIB IEMLIB_NAME=iemlib ! IEMLIB_OBJECTS := $(wildcard $(externals_src)/iemlib/src/*/[a-hj-z]*.c) iemlib: $(IEMLIB_OBJECTS:.c=.$(EXTENSION))