[PD-cvs] externals Makefile,1.21,1.22
Hans-Christoph Steiner
eighthave at users.sourceforge.net
Fri Dec 16 08:28:03 CET 2005
Update of /cvsroot/pure-data/externals
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28919
Modified Files:
Makefile
Log Message:
- added PDP to the build system, started with creb, pidip, pmpd.
- fixed random bugs
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Makefile 14 Dec 2005 00:32:04 -0000 1.21
--- Makefile 16 Dec 2005 07:28:01 -0000 1.22
***************
*** 49,53 ****
LDFLAGS += -bundle -bundle_loader $(pd_src)/bin/pd -L/sw/lib
LIBS += -lc
! STRIP = echo
else
ifeq ($(OS_NAME),win)
--- 49,53 ----
LDFLAGS += -bundle -bundle_loader $(pd_src)/bin/pd -L/sw/lib
LIBS += -lc
! STRIP = strip -x
else
ifeq ($(OS_NAME),win)
***************
*** 71,77 ****
--- 71,85 ----
endif
+ CXXFLAGS = $(CFLAGS)
+
%.o: %.c
$(CC) $(CFLAGS) -o "$*.o" -c "$*.c"
+ %.o: %.cpp
+ $(CXX) $(CXXFLAGS) -o "$*.o" -c "$*.cpp"
+
+ %.o: %.cc
+ $(CXX) $(CXXFLAGS) -o "$*.o" -c "$*.cc"
+
%.$(EXTENSION): %.o
$(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o" $(LIBS) \
***************
*** 91,95 ****
#$(patsubst %, %_install,$(TARGETS))
! BUILDSRC_OBJECTS = $(wildcard $(externals_src)/build/src/*.c)
all: pre_all_$(OS_NAME) $(BUILDSRC_OBJECTS:.c=.$(EXTENSION)) \
creb cxc cyclone ext13 freeverb \
--- 99,103 ----
#$(patsubst %, %_install,$(TARGETS))
! BUILDSRC_OBJECTS := $(wildcard $(externals_src)/build/src/*.c)
all: pre_all_$(OS_NAME) $(BUILDSRC_OBJECTS:.c=.$(EXTENSION)) \
creb cxc cyclone ext13 freeverb \
***************
*** 116,121 ****
iemabs_install iemabs_install iemlib_install iemmatrix_install loaders_install \
markex_install maxlib_install mjlib_install motex_install pddp_install \
! pdp_install pmpd_install toxy_install unauthorized_install vbap_install \
! zexy_install
@echo " "
@echo "externals install succeeded!"
--- 124,129 ----
iemabs_install iemabs_install iemlib_install iemmatrix_install loaders_install \
markex_install maxlib_install mjlib_install motex_install pddp_install \
! pdp_install pidip_install pmpd_install toxy_install unauthorized_install \
! vbap_install zexy_install
@echo " "
@echo "externals install succeeded!"
***************
*** 187,191 ****
# TEMPLATE
TEMPLATE_NAME=template
! TEMPLATE_OBJECTS = $(wildcard $(externals_src)/template/*.c)
template: $(TEMPLATE_OBJECTS:.c=.$(EXTENSION))
--- 195,199 ----
# TEMPLATE
TEMPLATE_NAME=template
! TEMPLATE_OBJECTS := $(wildcard $(externals_src)/template/*.c)
template: $(TEMPLATE_OBJECTS:.c=.$(EXTENSION))
***************
*** 218,221 ****
--- 226,232 ----
# CREB
CREB_NAME=creb
+ #CREB_OBJECTS := $(wildcard $(externals_src)/creb/modules/*.c)
+ #CREB_CXXOBJECTS := $(wildcard $(externals_src)/creb/modules++/*.cc)
+ #creb: $(CREB_CXXOBJECTS:.cc=.$(EXTENSION)) $(CREB_OBJECTS:.c=.$(EXTENSION))
creb:
***************
*** 240,244 ****
# CXC
CXC_NAME=cxc
! CXC_OBJECTS = $(wildcard $(externals_src)/cxc/???*.c)
cxc: $(CXC_OBJECTS:.c=.$(EXTENSION))
--- 251,255 ----
# CXC
CXC_NAME=cxc
! CXC_OBJECTS := $(wildcard $(externals_src)/cxc/???*.c)
cxc: $(CXC_OBJECTS:.c=.$(EXTENSION))
***************
*** 304,310 ****
# EXT13
EXT13_NAME=ext13
! # sfread.c doesn't compile, so exclude it
! EXT13_OBJECTS = $(wildcard $(externals_src)/ext13/???????*.c) \
! $(externals_src)/ext13/ftos.c $(externals_src)/ext13/send13.c
ext13: $(EXT13_OBJECTS:.c=.$(EXTENSION))
--- 315,324 ----
# EXT13
EXT13_NAME=ext13
! # openpatch and sfread.c doesn't compile, so exclude them
! EXT13_FILES = catch13~.c kalashnikov.c ossmixer.c receive13~.c sfwrite13~.c \
! wavinfo.c cdplayer.c mandelbrot.c piperead~.c scramble~.c streamin13~.c \
! mandelbrot~.c pipewrite~.c send13.c streamout13~.c filesize.c messages.c \
! promiscous~.c send13~.c strippath.c ftos.c receive13.c throw13~.c
! EXT13_OBJECTS = $(patsubst %,$(externals_src)/ext13/%,$(EXT13_FILES))
ext13: $(EXT13_OBJECTS:.c=.$(EXTENSION))
***************
*** 338,342 ****
FRANKENSTEIN_NAME=frankenstein
# exclude test.c since it is not used
! FRANKENSTEIN_OBJECTS = $(wildcard $(externals_src)/frankenstein/*.c)
frankenstein: $(FRANKENSTEIN_OBJECTS:.c=.$(EXTENSION))
--- 352,356 ----
FRANKENSTEIN_NAME=frankenstein
# exclude test.c since it is not used
! FRANKENSTEIN_OBJECTS := $(wildcard $(externals_src)/frankenstein/*.c)
frankenstein: $(FRANKENSTEIN_OBJECTS:.c=.$(EXTENSION))
***************
*** 370,374 ****
# FREEVERB
FREEVERB_NAME=freeverb
! FREEVERB_OBJECTS = $(wildcard $(externals_src)/freeverb~/*.c)
freeverb: $(FREEVERB_OBJECTS:.c=.$(EXTENSION))
--- 384,388 ----
# FREEVERB
FREEVERB_NAME=freeverb
! FREEVERB_OBJECTS := $(wildcard $(externals_src)/freeverb~/*.c)
freeverb: $(FREEVERB_OBJECTS:.c=.$(EXTENSION))
***************
*** 405,409 ****
# this build method doesn't work yet <hans at at.or.at>
! HID_OBJECTS = $(wildcard $(externals_src)/hcs/hid/*.c)
hid:
# $(CC) $(CFLAGS) -c $(HID_OBJECTS:.c=.$(EXTENSION))
--- 419,423 ----
# this build method doesn't work yet <hans at at.or.at>
! HID_OBJECTS := $(wildcard $(externals_src)/hcs/hid/*.c)
hid:
# $(CC) $(CFLAGS) -c $(HID_OBJECTS:.c=.$(EXTENSION))
***************
*** 500,504 ****
# LOADERS
LOADERS_NAME=
! LOADERS_OBJECTS = $(wildcard $(externals_src)/loaders/*.c)
loaders: $(LOADERS_OBJECTS:.c=.$(EXTENSION))
--- 514,518 ----
# LOADERS
LOADERS_NAME=
! LOADERS_OBJECTS := $(wildcard $(externals_src)/loaders/*.c)
loaders: $(LOADERS_OBJECTS:.c=.$(EXTENSION))
***************
*** 522,526 ****
# MARKEX
MARKEX_NAME=markex
! MARKEX_OBJECTS = $(wildcard $(externals_src)/markex/*.c)
markex: $(MARKEX_OBJECTS:.c=.$(EXTENSION))
--- 536,540 ----
# MARKEX
MARKEX_NAME=markex
! MARKEX_OBJECTS := $(wildcard $(externals_src)/markex/*.c)
markex: $(MARKEX_OBJECTS:.c=.$(EXTENSION))
***************
*** 548,552 ****
# MAXLIB
MAXLIB_NAME=maxlib
! MAXLIB_OBJECTS = $(wildcard $(externals_src)/maxlib/src/*.c)
maxlib: $(MAXLIB_OBJECTS:.c=.$(EXTENSION))
--- 562,566 ----
# MAXLIB
MAXLIB_NAME=maxlib
! MAXLIB_OBJECTS := $(wildcard $(externals_src)/maxlib/src/*.c)
maxlib: $(MAXLIB_OBJECTS:.c=.$(EXTENSION))
***************
*** 577,581 ****
MJLIB_NAME=mjlib
# exclude the library file mjLib.c
! MJLIB_OBJECTS = $(wildcard $(externals_src)/mjlib/[a-z]?[a-z]*.c)
mjlib: $(MJLIB_OBJECTS:.c=.$(EXTENSION))
--- 591,595 ----
MJLIB_NAME=mjlib
# exclude the library file mjLib.c
! MJLIB_OBJECTS := $(wildcard $(externals_src)/mjlib/[a-z]?[a-z]*.c)
mjlib: $(MJLIB_OBJECTS:.c=.$(EXTENSION))
***************
*** 604,608 ****
# MOTEX
MOTEX_NAME=motex
! MOTEX_OBJECTS = $(wildcard $(externals_src)/motex/*.c)
motex: $(MOTEX_OBJECTS:.c=.$(EXTENSION))
--- 618,622 ----
# MOTEX
MOTEX_NAME=motex
! MOTEX_OBJECTS := $(wildcard $(externals_src)/motex/*.c)
motex: $(MOTEX_OBJECTS:.c=.$(EXTENSION))
***************
*** 677,687 ****
#------------------------------------------------------------------------------#
# PDP
PDP_NAME=pdp
! pdp:
! # cd $(externals_src)/pdp && ./configure && $(MAKE)
! #TODO: compile pidip here
! #TODO: compile gem2pdp here
pdp_install: pdp
--- 691,706 ----
+
#------------------------------------------------------------------------------#
# PDP
PDP_NAME=pdp
! $(externals_src)/pdp/configure: $(externals_src)/pdp/configure.ac
! cd $(externals_src)/pdp && autoconf
!
! $(externals_src)/pdp/Makefile.config: $(externals_src)/pdp/Makefile.config.in
! cd $(externals_src)/pdp && ./configure
!
! pdp: $(externals_src)/pdp/configure $(externals_src)/pdp/Makefile.config
! -make -C $(externals_src)/pdp
pdp_install: pdp
***************
*** 692,696 ****
--license "GNU GPL"
-install -p $(externals_src)/pdp/*.$(EXTENSION) $(objectsdir)/$(PDP_NAME)
- -install -p $(externals_src)/gem2pdp/*.$(EXTENSION) $(objectsdir)/$(PDP_NAME)
install -p $(externals_src)/pdp/abstractions/*.pd $(objectsdir)/$(PDP_NAME)
install -d $(helpdir)/$(PDP_NAME)
--- 711,714 ----
***************
*** 704,715 ****
$(examplesdir)/$(PDP_NAME)
#------------------------------------------------------------------------------#
# PIDIP
PIDIP_NAME=pidip
! pidip:
! # cd $(externals_src)/pidip && ./configure && $(MAKE)
! pidip_install: pidip
install -d $(objectsdir)/$(PIDIP_NAME)
$(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PIDIP_NAME) \
--- 722,746 ----
$(examplesdir)/$(PDP_NAME)
+ pdp_clean:
+ -rm -f -- $(externals_src)/pdp/*.$(EXTENSION)
+ -find $(externals_src)/pdp -name '*.o' -delete
+ -rm -f -- $(externals_src)/pdp/*.bak
+ -rm -f -- $(externals_src)/pdp/Makefile.config
+ -rm -f -- $(externals_src)/pdp/configure
+
#------------------------------------------------------------------------------#
# PIDIP
PIDIP_NAME=pidip
! $(externals_src)/pidip/configure: $(externals_src)/pidip/configure.ac
! cd $(externals_src)/pidip && autoconf
! $(externals_src)/pidip/Makefile: $(externals_src)/pidip/Makefile.in
! cd $(externals_src)/pidip && ./configure --with-pd=../../pd --with-pdp=../pdp
!
! pidip: $(externals_src)/pidip/configure $(externals_src)/pidip/Makefile
! make -C $(externals_src)/pidip
!
! pidip_install:
install -d $(objectsdir)/$(PIDIP_NAME)
$(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PIDIP_NAME) \
***************
*** 721,724 ****
--- 752,758 ----
install -d $(examplesdir)/$(PIDIP_NAME)
install -p $(externals_src)/pidip/patches/*.* $(examplesdir)/$(PIDIP_NAME)
+ install -d $(manualsdir)/$(PIDIP_NAME)
+ install -p $(externals_src)/pidip/README \
+ $(manualsdir)/$(PIDIP_NAME)/README.txt
install -d $(examplesdir)/$(PIDIP_NAME)/images
install -p $(externals_src)/pidip/patches/images/*.* \
***************
*** 728,742 ****
$(examplesdir)/$(PIDIP_NAME)/morphology
#------------------------------------------------------------------------------#
# PMPD
PMPD_NAME=pmpd
! pmpd:
!
pmpd_install: pmpd
! # install -d $(objectsdir)/$(PMPD_NAME)
install -d $(helpdir)/$(PMPD_NAME)
install -p $(externals_src)/pmpd/help/*.pd $(helpdir)
install -d $(manualsdir)/$(PMPD_NAME)
install -d $(manualsdir)/$(PMPD_NAME)
--- 762,788 ----
$(examplesdir)/$(PIDIP_NAME)/morphology
+ pidip_clean:
+ -rm -f -- $(externals_src)/pidip/*.$(EXTENSION)
+ -find $(externals_src)/pidip -name '*.o' -delete
+ -rm -f -- $(externals_src)/pidip/*.bak
+ -rm -f -- $(externals_src)/pidip/Makefile
+ -rm -f -- $(externals_src)/pidip/configure
+
#------------------------------------------------------------------------------#
# PMPD
PMPD_NAME=pmpd
! PMPD_OBJECTS := $(wildcard $(externals_src)/pmpd/src/[a-lq-z]*.c)
! pmpd: $(PMPD_OBJECTS:.c=.$(EXTENSION))
pmpd_install: pmpd
! install -d $(objectsdir)/$(PMPD_NAME)
! $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PMPD_NAME) \
! --author "Cyrille Henry" \
! --description "Physical Modelling for Pd"
! -install -p $(externals_src)/pmpd/*.$(EXTENSION) $(objectsdir)/$(PMPD_NAME)
install -d $(helpdir)/$(PMPD_NAME)
install -p $(externals_src)/pmpd/help/*.pd $(helpdir)
+ install -p $(externals_src)/pmpd/help/*.pd $(helpdir)/$(PMPD_NAME)
install -d $(manualsdir)/$(PMPD_NAME)
install -d $(manualsdir)/$(PMPD_NAME)
***************
*** 747,750 ****
--- 793,802 ----
$(examplesdir)/$(PMPD_NAME)
+ pmpd_clean:
+ -rm -f -- $(PMPD_OBJECTS:.c=.$(EXTENSION))
+ -find $(externals_src)/pmpd -name '*.o' -delete
+ -find $(externals_src)/pmpd -name '*.bak' -delete
+ -find $(externals_src)/pmpd -name '*~' -delete
+
#------------------------------------------------------------------------------#
***************
*** 752,756 ****
SMLIB_NAME=smlib
# exclude SMlib.c since its just for the compiled library
! SMLIB_OBJECTS = $(wildcard $(externals_src)/smlib/source/[a-z]*.c)
smlib: $(SMLIB_OBJECTS:.c=.$(EXTENSION))
--- 804,808 ----
SMLIB_NAME=smlib
# exclude SMlib.c since its just for the compiled library
! SMLIB_OBJECTS := $(wildcard $(externals_src)/smlib/source/[a-z]*.c)
smlib: $(SMLIB_OBJECTS:.c=.$(EXTENSION))
***************
*** 814,819 ****
bash $(externals_src)/unauthorized/tk2c.bash < $*.tk > $*.tk2c
! UNAUTHORIZED_OBJECTS = $(wildcard $(externals_src)/unauthorized/[a-sw-z]*/*.c)
! # [vocoder~] to be built separately
UNAUTHORIZED_VOCODER = $(wildcard $(externals_src)/unauthorized/vocoder*/*.c)
unauthorized: $(UNAUTHORIZED_VOCODER:.c=.o) \
--- 866,871 ----
bash $(externals_src)/unauthorized/tk2c.bash < $*.tk > $*.tk2c
! UNAUTHORIZED_OBJECTS := $(wildcard $(externals_src)/unauthorized/[a-sw-z]*/*.c)
! # [vocoder~] is built separately since its made from a number of files
UNAUTHORIZED_VOCODER = $(wildcard $(externals_src)/unauthorized/vocoder*/*.c)
unauthorized: $(UNAUTHORIZED_VOCODER:.c=.o) \
***************
*** 871,875 ****
# Zexy
ZEXY_NAME = zexy
! ZEXY_OBJECTS = $(wildcard $(externals_src)/zexy/src/[a-y]*.c)
ZEXY_VERSION := $(shell grep VERSION $(externals_src)/zexy/src/zexy.h | \
grep -v _VERSION | cut -d ' ' -f 3 | cut -d '"' -f 2)
--- 923,927 ----
# Zexy
ZEXY_NAME = zexy
! ZEXY_OBJECTS := $(wildcard $(externals_src)/zexy/src/[a-y]*.c)
ZEXY_VERSION := $(shell grep VERSION $(externals_src)/zexy/src/zexy.h | \
grep -v _VERSION | cut -d ' ' -f 3 | cut -d '"' -f 2)
***************
*** 878,882 ****
zexy_install: zexy
install -d $(objectsdir)/$(ZEXY_NAME)
! $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(UNAUTHORIZED_NAME) \
--author "iohannes m zmoelnig <zmoelnig at iem.kug.ac.at>" \
--license "GNU GPL" \
--- 930,934 ----
zexy_install: zexy
install -d $(objectsdir)/$(ZEXY_NAME)
! $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(ZEXY_NAME) \
--author "iohannes m zmoelnig <zmoelnig at iem.kug.ac.at>" \
--license "GNU GPL" \
***************
*** 939,943 ****
# the destination-specific clean targets are in Makefile.buildlayout
! clean: creb_clean cxc_clean cyclone_clean ext13_clean frankenstein_clean freeverb_clean hid_clean loaders_clean markex_clean mjlib_clean motex_clean oscx_clean pddp_clean smlib_clean toxy_clean unauthorized_clean zexy_clean install_clean
-rm -f -- $(BUILDSRC_OBJECTS:.c=.o)
-rm -f -- $(BUILDSRC_OBJECTS:.c=.$(EXTENSION))
--- 991,995 ----
# the destination-specific clean targets are in Makefile.buildlayout
! clean: creb_clean cxc_clean cyclone_clean ext13_clean frankenstein_clean freeverb_clean hid_clean loaders_clean markex_clean mjlib_clean motex_clean oscx_clean pddp_clean pdp_clean pidip_clean smlib_clean toxy_clean unauthorized_clean zexy_clean install_clean
-rm -f -- $(BUILDSRC_OBJECTS:.c=.o)
-rm -f -- $(BUILDSRC_OBJECTS:.c=.$(EXTENSION))
More information about the Pd-cvs
mailing list