Update of /cvsroot/pure-data/packages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5956
Modified Files: Makefile Makefile.buildlayout TODO Log Message: generalized locations so that UNIX-style dir layout can also be used in addition to the Windows/MacOSX-style dir layout; fixed random bugs; added more the clean targets
Index: Makefile.buildlayout =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile.buildlayout,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile.buildlayout 30 Nov 2005 06:59:55 -0000 1.13 --- Makefile.buildlayout 2 Dec 2005 19:12:40 -0000 1.14 *************** *** 82,97 ****
ifeq ($(OS_NAME),darwin) ! objectsdir = $(DESTDIR)$(prefix)/extra ! pddocdir = $(DESTDIR)$(prefix)/doc else ifeq ($(OS_NAME),win) ! objectsdir = $(DESTDIR)$(prefix)/extra ! pddocdir = $(DESTDIR)$(prefix)/doc else ! objectsdir = $(libdir)/pd/extra ! pddocdir = $(libdir)/pd/doc endif endif
examplesdir = $(pddocdir)/examples helpdir = $(pddocdir)/5.reference --- 82,99 ----
ifeq ($(OS_NAME),darwin) ! libpddir = $(DESTDIR)$(prefix) ! libpdbindir = $(bindir) else ifeq ($(OS_NAME),win) ! libpddir = $(DESTDIR)$(prefix) ! libpdbindir = $(bindir) else ! libpddir = $(libdir)/pd ! libpdbindir = $(libpdbindir)/bin endif endif
+ objectsdir = $(libpddir)/extra + pddocdir = $(libpddir)/doc examplesdir = $(pddocdir)/examples helpdir = $(pddocdir)/5.reference *************** *** 219,227 **** -rm -f -- Makefile~ Makefile.buildlayout~ # sed replace litter ! -rm -f -- */*/*/*/*.*.bak ! -rm -f -- */*/*/*.*.bak ! -rm -f -- */*/*.*.bak ! -rm -f -- */*.*.bak ! -rm -f -- *.*.bak # autoconf cache -rm -rf -- */*/*/*/autom4te.cache --- 221,235 ---- -rm -f -- Makefile~ Makefile.buildlayout~ # sed replace litter ! -rm -f -- */*/*/*/*.bak ! -rm -f -- */*/*/*.bak ! -rm -f -- */*/*.bak ! -rm -f -- */*.bak ! -rm -f -- *.bak ! # patching replace litter ! -rm -f -- */*/*/*/*.rej ! -rm -f -- */*/*/*.rej ! -rm -f -- */*/*.rej ! -rm -f -- */*.rej ! -rm -f -- *.rej # autoconf cache -rm -rf -- */*/*/*/autom4te.cache
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Makefile 30 Nov 2005 06:59:55 -0000 1.17 --- Makefile 2 Dec 2005 19:12:40 -0000 1.18 *************** *** 93,96 **** --- 93,97 ---- DESTDIR=$(DESTDIR) \ prefix=$(prefix) \ + libpddir=$(libpddir) \ UNAME=$(UNAME)
*************** *** 137,144 **** #------------------------------------------------------------------------------ # pd - # pd's makefile has some of its own variables that need to be remapped, - # this relies on patches/build_vars_4_makefile.in.patch.
! PD_CONFIGURE_FLAGS = PD_BUILD_FLAGS =
--- 138,148 ---- #------------------------------------------------------------------------------ # pd
! ifeq ($(OS_NAME),win) ! PD_CONFIGURE_FLAGS = ! else ! PD_CONFIGURE_FLAGS = --enable-jack ! endif ! PD_BUILD_FLAGS =
*************** *** 149,162 ****
pd: - @echo "OS_NAME $(OS_NAME)" - @echo "===================================================================" - @echo "DESTDIR $(DESTDIR) libpdbindir $(libpdbindir)" - @echo "===================================================================" - @echo "DEST_PATHS $(DEST_PATHS)" - @echo "===================================================================" - @echo "DEST_PATHS $(DEST_PATHS)" - @echo "===================================================================" - @echo "PD_BUILD_FLAGS $(PD_BUILD_FLAGS)" - @echo "===================================================================" -cd $(pd_src)/src/ && $(PD_AUTOCONF) -cd $(pd_src)/src && ./configure $(PD_CONFIGURE_FLAGS) && \ --- 153,156 ---- *************** *** 533,540 **** patch_pd: @echo pd_src $(pd_src) - # change Pd's version number to reflect the extended build - cd $(pd_src)/src/ && \ - sed 's/(pd_version[] = "Pd version )[0-9extndRC.-]*/\1$(PD_VERSION)-$(PACKAGE_VERSION)/' s_main.c > s_main.c.tmp && \ - mv s_main.c.tmp s_main.c # apply all platform-neutral patches for patch in $(wildcard $(CWD)/patches/*.patch); do \ --- 527,530 ---- *************** *** 548,551 **** --- 538,549 ---- done -rm -f -- $(pd_src)/src/configure $(pd_src)/src/makefile + # change Pd's version number to reflect the extended build + cd $(pd_src)/src/ && \ + sed 's/(pd_version[] = "Pd version )[0-9extndRC.-]*/\1$(PD_VERSION)-$(PACKAGE_VERSION)/' s_main.c > s_main.c.tmp && \ + mv s_main.c.tmp s_main.c + for file in $(wildcard *.[ch]); do \ + sed 's/MACOSX/__APPLE__/g' $${file} > $${file}.tmp && \ + mv -f $${file}.tmp $$file;\ + done @echo " " @echo "patching succeeded!" *************** *** 553,556 **** --- 551,558 ----
unpatch_pd: + for file in $(wildcard *.[ch]); do \ + sed 's/__APPLE__/MACOSX/g' $${file} > $${file}.tmp && \ + mv -f $${file}.tmp $$file;\ + done # this sed pattern won't work with TEST versions cd $(pd_src)/src && \ *************** *** 558,568 **** s_main.c > s_main.c.tmp && \ mv s_main.c.tmp s_main.c ! # apply all platform-neutral patches ! for patch in $(wildcard $(CWD)/patches/*.patch); do \ echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 -R < $$patch; \ done ! # apply all platform-specific patches ! for patch in $(wildcard $(CWD)/patches/$(OS_NAME)/*.patch); do \ echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 -R < $$patch; \ --- 560,570 ---- s_main.c > s_main.c.tmp && \ mv s_main.c.tmp s_main.c ! # apply all platform-specific patches ! for patch in $(wildcard $(CWD)/patches/$(OS_NAME)/*.patch); do \ echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 -R < $$patch; \ done ! # apply all platform-neutral patches ! for patch in $(wildcard $(CWD)/patches/*.patch); do \ echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 -R < $$patch; \ *************** *** 606,609 **** --- 608,616 ----
distclean: clean cruft_clean + cd $(abstractions_src) && make distclean + cd $(doc_src) && make distclean + cd $(extensions_src) && make distclean + cd $(externals_src) && make distclean + cd $(pd_src) && make distclean
test: *************** *** 617,620 **** --- 624,629 ---- @echo "OBJECTSDIR $(objectsdir)" @echo "PDDOCDIR $(pddocdir)" + @echo "LIBPDDIR $(libpddir)" + @echo "LIBPDBINDIR $(libpdbindir)" @echo "HELPDIR $(helpdir)" @echo "MANUALSDIR $(manualsdir)"
Index: TODO =================================================================== RCS file: /cvsroot/pure-data/packages/TODO,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TODO 30 Nov 2005 06:59:55 -0000 1.11 --- TODO 2 Dec 2005 19:12:40 -0000 1.12 *************** *** 1,3 **** --- 1,5 ----
+ - try out FFTW patch from patch tracker + - document generate-libdir-metafile.sh