doc Makefile,1.9,1.10 Makefile.buildlayout,1.4,1.5 - Pd-cvs

26 Nov 2005


      Update of /cvsroot/pure-data/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28178
Modified Files:
    Makefile Makefile.buildlayout 
Log Message:
updated names to be more GNU-like and easier to read
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/doc/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile	26 Nov 2005 01:52:02 -0000	1.9
--- Makefile	26 Nov 2005 04:19:27 -0000	1.10
***************
*** 11,16 ****
# these are designed to be overridden by the packages/Makefile
! SRC_ROOT_DIR = $(CWD)/..
! INSTALL_PREFIX = build
  BUILDLAYOUT_DIR = $(CWD)
--- 11,16 ----
# these are designed to be overridden by the packages/Makefile
! cvs_root_dir = $(CWD)/..
! prefix = build
  BUILDLAYOUT_DIR = $(CWD)
***************
*** 29,33 ****
  # clean up after everything is installed
  final_setup:
! 	chmod -R ugo-w $(DOCS_DEST)
install: pd_fileformat_install pd-msg_install pddp_install tutorials_install
--- 29,33 ----
  # clean up after everything is installed
  final_setup:
! 	chmod -R ugo-w $(pddocdir)
install: pd_fileformat_install pd-msg_install pddp_install tutorials_install
***************
*** 44,56 ****
  # PD-MSG
  PD-MSG_NAME = pd-msg
! pd-msg_install: $(MANUALS_DEST)
! 	install -d $(MANUALS_DEST)/$(PD-MSG_NAME)
! 	install -p $(DOC_SRC)/additional/pd-msg/*.txt \
! 		$(MANUALS_DEST)/$(PD-MSG_NAME) 
! 	for dir in $(shell cd  $(DOC_SRC)/additional/pd-msg && ls -d [1-5].*); do \
    	echo "Including $$dir in $(PD-MSG_NAME)"; \
! 		install -d $(MANUALS_DEST)/$(PD-MSG_NAME)/$$dir; \
! 		install -p $(DOC_SRC)/additional/pd-msg/$$dir/*.* \
! 			$(MANUALS_DEST)/$(PD-MSG_NAME)/$$dir; \
    done
--- 44,56 ----
  # PD-MSG
  PD-MSG_NAME = pd-msg
! pd-msg_install: $(manualsdir)
! 	install -d $(manualsdir)/$(PD-MSG_NAME)
! 	install -p $(doc_src)/additional/pd-msg/*.txt \
! 		$(manualsdir)/$(PD-MSG_NAME) 
! 	for dir in $(shell cd  $(doc_src)/additional/pd-msg && ls -d [1-5].*); do \
    	echo "Including $$dir in $(PD-MSG_NAME)"; \
! 		install -d $(manualsdir)/$(PD-MSG_NAME)/$$dir; \
! 		install -p $(doc_src)/additional/pd-msg/$$dir/*.* \
! 			$(manualsdir)/$(PD-MSG_NAME)/$$dir; \
    done
***************
*** 60,103 ****
  # PD_FILEFORMAT
  PD_FILEFORMAT_NAME = Pd
! pd_fileformat_install: $(MANUALS_DEST)
! 	install -d $(MANUALS_DEST)/$(PD_FILEFORMAT_NAME)
    curl http://student-kmt.hku.nl/%7Etjeerd/pd/pd_fileformat.html > \
! 		$(MANUALS_DEST)/$(PD_FILEFORMAT_NAME)/Pd_File_Format.html
#------------------------------------------------------------------------------#
  # EXTERNALS-HOWTO
  EXTERNALS-HOWTO_NAME = Externals-HOWTO
! externals-howto_install: $(MANUALS_DEST)
! 	install -d $(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)
    curl http://iem.kug.ac.at/pd/externals-HOWTO/pd-externals-HOWTO.pdf > \
! 		$(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/pd-externals-HOWTO.pdf
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node1.html > \
! 		$(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node1.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node2.html > \
! 		$(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node2.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node3.html > \
! 		$(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node3.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node4.html > \
! 		$(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node5.html > \
! 		$(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node5.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node6.html > \
! 		$(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node6.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node7.html > \
! 		$(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node7.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node8.html > \
! 		$(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node8.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node9.html > \
! 		$(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node9.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node10.html > \
! 		$(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node10.html
#------------------------------------------------------------------------------#
  # PDDP
! pddp_install: $(HELP_DEST)
! 	install -p $(DOC_SRC)/pddp/*.pd $(HELP_DEST)
  # this file is used in key-help.pd
! 	install -p $(DOC_SRC)/pddp/keyboard_fun.txt $(HELP_DEST)
--- 60,103 ----
  # PD_FILEFORMAT
  PD_FILEFORMAT_NAME = Pd
! pd_fileformat_install: $(manualsdir)
! 	install -d $(manualsdir)/$(PD_FILEFORMAT_NAME)
    curl http://student-kmt.hku.nl/%7Etjeerd/pd/pd_fileformat.html > \
! 		$(manualsdir)/$(PD_FILEFORMAT_NAME)/Pd_File_Format.html
#------------------------------------------------------------------------------#
  # EXTERNALS-HOWTO
  EXTERNALS-HOWTO_NAME = Externals-HOWTO
! externals-howto_install: $(manualsdir)
! 	install -d $(manualsdir)/$(EXTERNALS-HOWTO_NAME)
    curl http://iem.kug.ac.at/pd/externals-HOWTO/pd-externals-HOWTO.pdf > \
! 		$(manualsdir)/$(EXTERNALS-HOWTO_NAME)/pd-externals-HOWTO.pdf
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node1.html > \
! 		$(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node1.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node2.html > \
! 		$(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node2.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node3.html > \
! 		$(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node3.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node4.html > \
! 		$(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node5.html > \
! 		$(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node5.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node6.html > \
! 		$(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node6.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node7.html > \
! 		$(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node7.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node8.html > \
! 		$(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node8.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node9.html > \
! 		$(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node9.html
    curl http://iem.kug.ac.at/pd/externals-HOWTO/node10.html > \
! 		$(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node10.html
#------------------------------------------------------------------------------#
  # PDDP
! pddp_install: $(helpdir)
! 	install -p $(doc_src)/pddp/*.pd $(helpdir)
  # this file is used in key-help.pd
! 	install -p $(doc_src)/pddp/keyboard_fun.txt $(helpdir)
***************
*** 105,117 ****
  #------------------------------------------------------------------------------#
  # TUTORIALS
! tutorials_install: $(MANUALS_DEST)
  # pddrums
! 	install -d $(MANUALS_DEST)/PdDrums
! 	install -p $(DOC_SRC)/tutorials/footils/pddrums/*.* $(MANUALS_DEST)/PdDrums
  # playnow
! 	install -d $(MANUALS_DEST)/PlayNow
! 	install -p $(DOC_SRC)/tutorials/playnow/*.pd $(MANUALS_DEST)/PlayNow
  # these aren't needed yet hans@at.or.at
! #	install -p $(DOC_SRC)/tutorials/playnow/*.mid $(MANUALS_DEST)/PlayNow
--- 105,117 ----
  #------------------------------------------------------------------------------#
  # TUTORIALS
! tutorials_install: $(manualsdir)
  # pddrums
! 	install -d $(manualsdir)/PdDrums
! 	install -p $(doc_src)/tutorials/footils/pddrums/*.* $(manualsdir)/PdDrums
  # playnow
! 	install -d $(manualsdir)/PlayNow
! 	install -p $(doc_src)/tutorials/playnow/*.pd $(manualsdir)/PlayNow
  # these aren't needed yet hans@at.or.at
! #	install -p $(doc_src)/tutorials/playnow/*.mid $(manualsdir)/PlayNow
***************
*** 124,144 ****
  # make the symlinks necessary to simulate the installed environment
  devsymlinks:
! 	test -e $(DOC_SRC)/2.control.examples || \
! 		ln -s $(PD_SRC)/doc/2.control.examples $(DOC_SRC)/2.control.examples
! 	test -e $(DOC_SRC)/3.audio.examples || \
! 		ln -s $(PD_SRC)/doc/3.audio.examples $(DOC_SRC)/3.audio.examples
  # pd <= 0.38-4 has 4.fft.examples
! 	test -e $(DOC_SRC)/4.fft.examples || \
! 		ln -s $(PD_SRC)/doc/4.fft.examples $(DOC_SRC)/4.fft.examples
  # pd > 0.38-4 has 4.data.structures
! 	test -e $(DOC_SRC)/4.data.structures || \
! 		ln -s $(PD_SRC)/doc/4.data.structures $(DOC_SRC)/4.data.structures
! 	test -e $(DOC_SRC)/7.stuff || \
! 		ln -s $(PD_SRC)/doc/7.stuff $(DOC_SRC)/7.stuff
! 	test -e $(DOC_SRC)/sound || \
! 		ln -s $(PD_SRC)/doc/sound $(DOC_SRC)/sound
  # put the pddp support objects in the path
! 	test -e $(DOC_SRC)/pddp/pddp || \
! 		ln -s $(ABSTRACTIONS_SRC)/pddp $(DOC_SRC)/pddp/pddp
#==============================================================================#
--- 124,144 ----
  # make the symlinks necessary to simulate the installed environment
  devsymlinks:
! 	test -e $(doc_src)/2.control.examples || \
! 		ln -s $(pd_src)/doc/2.control.examples $(doc_src)/2.control.examples
! 	test -e $(doc_src)/3.audio.examples || \
! 		ln -s $(pd_src)/doc/3.audio.examples $(doc_src)/3.audio.examples
  # pd <= 0.38-4 has 4.fft.examples
! 	test -e $(doc_src)/4.fft.examples || \
! 		ln -s $(pd_src)/doc/4.fft.examples $(doc_src)/4.fft.examples
  # pd > 0.38-4 has 4.data.structures
! 	test -e $(doc_src)/4.data.structures || \
! 		ln -s $(pd_src)/doc/4.data.structures $(doc_src)/4.data.structures
! 	test -e $(doc_src)/7.stuff || \
! 		ln -s $(pd_src)/doc/7.stuff $(doc_src)/7.stuff
! 	test -e $(doc_src)/sound || \
! 		ln -s $(pd_src)/doc/sound $(doc_src)/sound
  # put the pddp support objects in the path
! 	test -e $(doc_src)/pddp/pddp || \
! 		ln -s $(abstractions_src)/pddp $(doc_src)/pddp/pddp
#==============================================================================#
Index: Makefile.buildlayout
===================================================================
RCS file: /cvsroot/pure-data/doc/Makefile.buildlayout,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.buildlayout	26 Nov 2005 01:52:02 -0000	1.4
--- Makefile.buildlayout	26 Nov 2005 04:19:27 -0000	1.5
***************
*** 10,19 ****
  # kept in each section of the CVS so that each section will be self-contained.
  # To use it, you need to include it in your Makefile (i.e. "include
! # Makefile.buildlayout") and then define $(INSTALL_PREFIX) and $(SRC_ROOT_DIR).
  #
! # $(SRC_ROOT_DIR) is the base directory of src tree, equivalent to the root
  # level of the pure-data CVS.
  #
! # $(INSTALL_PREFIX) is the base directory to where all of the resulting files
  # will be copied.
  #
--- 10,19 ----
  # kept in each section of the CVS so that each section will be self-contained.
  # To use it, you need to include it in your Makefile (i.e. "include
! # Makefile.buildlayout") and then define $(prefix) and $(cvs_root_dir).
  #
! # $(cvs_root_dir) is the base directory of src tree, equivalent to the root
  # level of the pure-data CVS.
  #
! # $(prefix) is the base directory to where all of the resulting files
  # will be copied.
  #
***************
*** 64,88 ****
# sources
! ABSTRACTIONS_SRC = $(SRC_ROOT_DIR)/abstractions
! DOC_SRC = $(SRC_ROOT_DIR)/doc
! EXTENSIONS_SRC = $(SRC_ROOT_DIR)/extensions
! EXTERNALS_SRC = $(SRC_ROOT_DIR)/externals
! FLEXT_SRC = $(SRC_ROOT_DIR)/externals/grill/flext
! GEM_SRC = $(SRC_ROOT_DIR)/Gem
! PACKAGES_SRC = $(SRC_ROOT_DIR)/packages
! PD_SRC = $(SRC_ROOT_DIR)/pd
! SCRIPTS_SRC = $(SRC_ROOT_DIR)/scripts
# destinations
! APPLICATIONS_DEST = $(DOCS_DEST)/examples
! BIN_DEST = $(INSTALL_PREFIX)/bin
! DOCS_DEST = $(INSTALL_PREFIX)/doc
! INCLUDE_DEST = $(INSTALL_PREFIX)/include
! LIB_DEST = $(INSTALL_PREFIX)/lib
! MAN_DEST = $(INSTALL_PREFIX)/man
! OBJECTS_DEST = $(INSTALL_PREFIX)/extra
! HELP_DEST = $(DOCS_DEST)/5.reference
! MANUALS_DEST = $(DOCS_DEST)/manuals
--- 64,88 ----
# sources
! abstractions_src = $(cvs_root_dir)/abstractions
! doc_src = $(cvs_root_dir)/doc
! extensions_src = $(cvs_root_dir)/extensions
! externals_src = $(cvs_root_dir)/externals
! flext_src = $(cvs_root_dir)/externals/grill/flext
! gem_src = $(cvs_root_dir)/Gem
! packages_src = $(cvs_root_dir)/packages
! pd_src = $(cvs_root_dir)/pd
! scripts_src = $(cvs_root_dir)/scripts
# destinations
! examplesdir = $(pddocdir)/examples
! bindir = $(prefix)/bin
! pddocdir = $(prefix)/doc
! includedir = $(prefix)/include
! libdir = $(prefix)/lib
! mandir = $(prefix)/man
! objectsdir = $(prefix)/extra
! helpdir = $(pddocdir)/5.reference
! manualsdir = $(pddocdir)/manuals
***************
*** 94,114 ****
# first make sure that the directory structure is setup
! $(INSTALL_PREFIX):
! 	install -d $(INSTALL_PREFIX)
! $(APPLICATIONS_DEST):  $(INSTALL_PREFIX)
! 	install -d $(APPLICATIONS_DEST)
! $(DOCS_DEST): $(INSTALL_PREFIX)
! 	install -d $(DOCS_DEST)
! $(HELP_DEST): $(INSTALL_PREFIX)
! 	install -d $(HELP_DEST)
! $(MANUALS_DEST): $(INSTALL_PREFIX)
! 	install -d $(MANUALS_DEST)
! $(OBJECTS_DEST): $(INSTALL_PREFIX)
! 	install -d $(OBJECTS_DEST)
--- 94,114 ----
# first make sure that the directory structure is setup
! $(prefix):
! 	install -d $(prefix)
! $(examplesdir):  $(prefix)
! 	install -d $(examplesdir)
! $(pddocdir): $(prefix)
! 	install -d $(pddocdir)
! $(helpdir): $(prefix)
! 	install -d $(helpdir)
! $(manualsdir): $(prefix)
! 	install -d $(manualsdir)
! $(objectsdir): $(prefix)
! 	install -d $(objectsdir)
***************
*** 120,128 ****
! PD_MAJOR_VERSION := $(shell grep 'Pd version' $(PD_SRC)/src/s_main.c | \
    sed 's/char pd_version[] = "Pd version ([0-9]).[0-9]*[. TES-]*[0-9]*[0-9extndRC.-]*\n";/\1/')
! PD_MINOR_VERSION := $(shell grep 'Pd version' $(PD_SRC)/src/s_main.c | \
    sed 's/char pd_version[] = "Pd version [0-9].([0-9]*)[. TES-]*([0-9]*)[0-9extndRC.-]*\n";/\1/')
! PD_BUGFIX_VERSION := $(shell grep 'Pd version' $(PD_SRC)/src/s_main.c | \
    sed 's/char pd_version[] = "Pd version [0-9].[0-9]*[. TES-]*([0-9]*)[0-9extndRC.-]*\n";/\1/')
  # the separators [.-] need to be the same as in s_main.c or the regexps break
--- 120,128 ----
! PD_MAJOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \
    sed 's/char pd_version[] = "Pd version ([0-9]).[0-9]*[. TES-]*[0-9]*[0-9extndRC.-]*\n";/\1/')
! PD_MINOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \
    sed 's/char pd_version[] = "Pd version [0-9].([0-9]*)[. TES-]*([0-9]*)[0-9extndRC.-]*\n";/\1/')
! PD_BUGFIX_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \
    sed 's/char pd_version[] = "Pd version [0-9].[0-9]*[. TES-]*([0-9]*)[0-9extndRC.-]*\n";/\1/')
  # the separators [.-] need to be the same as in s_main.c or the regexps break
***************
*** 143,191 ****
applications_clean:
! 	-rm -f -- $(APPLICATIONS_DEST)/*/*/*/*/*.*
! 	-rm -f -- $(APPLICATIONS_DEST)/*/*/*/*.*
! 	-rm -f -- $(APPLICATIONS_DEST)/*/*/*.*
! 	-rm -f -- $(APPLICATIONS_DEST)/*/*.*
! 	-rmdir $(APPLICATIONS_DEST)/*/*/*/*
! 	-rmdir $(APPLICATIONS_DEST)/*/*/*
! 	-rmdir $(APPLICATIONS_DEST)/*/*
! 	-rmdir $(APPLICATIONS_DEST)/*
! 	-rmdir $(APPLICATIONS_DEST)
help_clean:
! 	-rm -f -- $(HELP_DEST)/*/*/*.*
! 	-rm -f -- $(HELP_DEST)/*/*.*
! 	-rm -f -- $(HELP_DEST)/*.*
! 	-rmdir $(HELP_DEST)/*/*
! 	-rmdir $(HELP_DEST)/*
! 	-rmdir $(HELP_DEST)
manuals_clean:
! 	-rm -f -- $(MANUALS_DEST)/*/*/*.*
! 	-rm -f -- $(MANUALS_DEST)/*/*.*
! 	-rmdir $(MANUALS_DEST)/*/*
! 	-rmdir $(MANUALS_DEST)/*
! 	-rmdir $(MANUALS_DEST)
objects_clean:
! 	-rm $(OBJECTS_DEST)/*/*/*.pd
! 	-rm $(OBJECTS_DEST)/*/*.pd
! 	-rm $(OBJECTS_DEST)/*.pd
! 	-rm $(OBJECTS_DEST)/*/*/*.$(EXTENSION)
! 	-rm $(OBJECTS_DEST)/*/*.$(EXTENSION)
! 	-rm $(OBJECTS_DEST)/*.$(EXTENSION)
! 	-rmdir $(OBJECTS_DEST)/*/*
! 	-rmdir $(OBJECTS_DEST)/*
! 	-rmdir $(OBJECTS_DEST)
install_clean: applications_clean help_clean manuals_clean objects_clean
! 	-rmdir $(DOCS_DEST)
! 	-rmdir $(INSTALL_PREFIX)
    @echo " "
! 	@echo "Build destination cleaned: $(INSTALL_PREFIX)"
--- 143,191 ----
applications_clean:
! 	-rm -f -- $(examplesdir)/*/*/*/*/*.*
! 	-rm -f -- $(examplesdir)/*/*/*/*.*
! 	-rm -f -- $(examplesdir)/*/*/*.*
! 	-rm -f -- $(examplesdir)/*/*.*
! 	-rmdir $(examplesdir)/*/*/*/*
! 	-rmdir $(examplesdir)/*/*/*
! 	-rmdir $(examplesdir)/*/*
! 	-rmdir $(examplesdir)/*
! 	-rmdir $(examplesdir)
help_clean:
! 	-rm -f -- $(helpdir)/*/*/*.*
! 	-rm -f -- $(helpdir)/*/*.*
! 	-rm -f -- $(helpdir)/*.*
! 	-rmdir $(helpdir)/*/*
! 	-rmdir $(helpdir)/*
! 	-rmdir $(helpdir)
manuals_clean:
! 	-rm -f -- $(manualsdir)/*/*/*.*
! 	-rm -f -- $(manualsdir)/*/*.*
! 	-rmdir $(manualsdir)/*/*
! 	-rmdir $(manualsdir)/*
! 	-rmdir $(manualsdir)
objects_clean:
! 	-rm $(objectsdir)/*/*/*.pd
! 	-rm $(objectsdir)/*/*.pd
! 	-rm $(objectsdir)/*.pd
! 	-rm $(objectsdir)/*/*/*.$(EXTENSION)
! 	-rm $(objectsdir)/*/*.$(EXTENSION)
! 	-rm $(objectsdir)/*.$(EXTENSION)
! 	-rmdir $(objectsdir)/*/*
! 	-rmdir $(objectsdir)/*
! 	-rmdir $(objectsdir)
install_clean: applications_clean help_clean manuals_clean objects_clean
! 	-rmdir $(pddocdir)
! 	-rmdir $(prefix)
    @echo " "
! 	@echo "Build destination cleaned: $(prefix)"