Update of /cvsroot/pure-data/externals/moocow/extended In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6884
Modified Files: Makefile README.pod README.txt Log Message: + expect CFLAGS and pd_src from parent Makefile + clobber DESTDIR from parent Makefile for children - since automake/autoconf respect DESTDIR: bummer + always autogen && configure on 'make build.stamp' + attempt to build even libraries with dependencies (flite,gfsm)
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/moocow/extended/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 2 Aug 2007 22:48:57 -0000 1.2 --- Makefile 3 Aug 2007 11:06:05 -0000 1.3 *************** *** 10,31 ****
SUBDIRS = \ ../deque \ ../pdstring \ ../readdir \ ! ../weightmap \ ! ../../sprinkler ! ! # ../flite ../gfsm ! ! #CFLAGS ?= -march=k8
! MOOCOW_DIR ?=$(shell pwd) ! MOOCOW_BUILD ?=$(MOOCOW_DIR)/build
CONFIGURE_ARGS=\ CFLAGS="$(CFLAGS)" \ ! --with-pd-include="$(pd_src)" \ ! --with-pd-dir="$(MOOCOW_BUILD)" \ ! --with-pd-extdir="$(MOOCOW_BUILD)/externs"
##====================================================================== --- 10,37 ----
SUBDIRS = \ + ../flite \ + ../gfsm \ ../deque \ ../pdstring \ ../readdir \ ! ../../sprinkler \ ! ../weightmap
! ##-- local variables ! MOOCOW_DIR ?=$(shell pwd) ! MOOCOW_BUILD ?=$(MOOCOW_DIR)/build.moo ! MOOCOW_MFLAGS ?=DESTDIR=""
CONFIGURE_ARGS=\ CFLAGS="$(CFLAGS)" \ ! --with-pd-include="$(pd_src)/src" \ ! --with-pd-dir="$(MOOCOW_BUILD)" ! ! # --with-pd-extdir="$(MOOCOW_BUILD)/externs" ! ! ##-- defaults ! CFLAGS ?= -g -O2 ! pd_src ?= $(CURDIR)/../../../pd !
##====================================================================== *************** *** 44,56 ****
clean: ! for d in $(SUBDIRS); do $(MAKE) -C $$d clean || true; rm -f $$d/build.stamp; done; rm -f build.stamp config.log rm -rf $(MOOCOW_BUILD)
realclean: clean ! for d in $(SUBDIRS); do $(MAKE) -C $$d realclean || true; done;
cvsclean: clean ! for d in $(SUBDIRS); do $(MAKE) -C $$d cvsclean || true; done;
--- 50,65 ----
clean: ! for d in $(SUBDIRS); do $(MAKE) $(MOOCOW_MFLAGS) -C $$d clean || true; rm -f $$d/build.stamp; done; rm -f build.stamp config.log rm -rf $(MOOCOW_BUILD)
realclean: clean ! for d in $(SUBDIRS); do $(MAKE) $(MOOCOW_MFLAGS) -C $$d realclean || true; done; ! ! distclean: clean ! for d in $(SUBDIRS); do $(MAKE) $(MOOCOW_MFLAGS) -C $$d distclean || true; done;
cvsclean: clean ! for d in $(SUBDIRS); do $(MAKE) $(MOOCOW_MFLAGS) -C $$d cvsclean || true; done;
*************** *** 60,84 **** ## RULES = $(call subdir_template,$(dir_path),$(configure_args)) define subdir_template ! $(1)-autogen: ! (cd $(1); ./autogen.sh) || true
$(1)-configure: $(1)-autogen ! (cd $(1); ./configure $(CONFIGURE_ARGS) $(2)) || true
$(1)/build.stamp: $(1)-configure ! $(MAKE) -C $(1) all install || true touch $$@
$(1)-clean: $(MAKE) -C $(1) clean || true - endef
##====================================================================== ## Rules: subdirectories
$(eval $(call subdir_template,../deque)) - #$(eval $(call subdir_template,../flite)) - #$(eval $(call subdir_template,../gfsm)) $(eval $(call subdir_template,../pdstring,--enable-object-externals)) $(eval $(call subdir_template,../readdir)) --- 69,102 ---- ## RULES = $(call subdir_template,$(dir_path),$(configure_args)) define subdir_template ! $(1)-autogen: $(1)-distclean ! (cd $(1); sh ./autogen.sh) || true
$(1)-configure: $(1)-autogen ! (cd $(1); sh ./configure $(CONFIGURE_ARGS) $(2)) || true
$(1)/build.stamp: $(1)-configure ! $(MAKE) $(MOOCOW_MFLAGS) -C $(1) all install || true touch $$@
$(1)-clean: $(MAKE) -C $(1) clean || true
+ $(1)-distclean: + $(MAKE) -C $(1) distclean || true + endef
##====================================================================== ## Rules: subdirectories
+ ##-- flite, gfsm: simulate failed builds + #$(eval $(call subdir_template,../flite,--with-flite-dir=/NOPE)) + #$(eval $(call subdir_template,../gfsm,--disable-gfsm)) + + ##-- flite, gfsm: build 'em if you got 'em + $(eval $(call subdir_template,../flite)) + $(eval $(call subdir_template,../gfsm)) + + ##-- the usual suspects $(eval $(call subdir_template,../deque)) $(eval $(call subdir_template,../pdstring,--enable-object-externals)) $(eval $(call subdir_template,../readdir))
Index: README.txt =================================================================== RCS file: /cvsroot/pure-data/externals/moocow/extended/README.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** README.txt 1 Aug 2007 23:36:36 -0000 1.1 --- README.txt 3 Aug 2007 11:06:05 -0000 1.2 *************** *** 18,37 ****
SUPPORTED EXTERNALS ! This makefile currently supports the following of moocow's externals:
deque pdstring (just the dummy object, not the library!) ! any2string ! string2any readdir weightmap
! The following of moocow's externals are unsupported (for various ! reasons):
flite gfsm ratts
ACKNOWLEDGEMENTS Pd by Miller Puckette and others. --- 18,49 ----
SUPPORTED EXTERNALS ! Standard Externals ! The following externals are built by default:
deque pdstring (just the dummy object, not the library!) ! any2string ! string2any readdir + sprinkler weightmap
! Optional Externals ! The following externals depend on additional libraries, which may or may ! not be installed on your system. The build procedures for these ! externals will be called, but may fail:
flite gfsm + + Unsupported Externals + The following externals and libraries are unsupported for various + reasons: + ratts
+ See http://www.ling.uni-potsdam.de/~moocow/projects/pd for the + "official" distributions. + ACKNOWLEDGEMENTS Pd by Miller Puckette and others.
Index: README.pod =================================================================== RCS file: /cvsroot/pure-data/externals/moocow/extended/README.pod,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** README.pod 1 Aug 2007 23:36:36 -0000 1.1 --- README.pod 3 Aug 2007 11:06:05 -0000 1.2 *************** *** 20,40 **** This is intended to be called from externals/Makefile.
=head1 SUPPORTED EXTERNALS
! This makefile currently supports the following of moocow's externals:
deque pdstring (just the dummy object, not the library!) ! any2string ! string2any readdir weightmap
! The following of moocow's externals are unsupported (for various reasons):
flite gfsm ratts
=head1 ACKNOWLEDGEMENTS --- 20,56 ---- This is intended to be called from externals/Makefile.
+ =head1 SUPPORTED EXTERNALS
! =head2 Standard Externals ! ! The following externals are built by default:
deque pdstring (just the dummy object, not the library!) ! any2string ! string2any readdir + sprinkler weightmap
! =head2 Optional Externals ! ! The following externals depend on additional libraries, which may or may ! not be installed on your system. The build procedures for these externals ! will be called, but may fail:
flite gfsm + + =head2 Unsupported Externals + + The following externals and libraries are unsupported for various reasons: + ratts
+ See http://www.ling.uni-potsdam.de/~moocow/projects/pd for the "official" + distributions. +
=head1 ACKNOWLEDGEMENTS