From 6b9e94c4a76ff641f64c822e9c717781b9ba3543 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sat, 26 Nov 2005 04:20:39 +0000 Subject: updated names to be more GNU-like and easier to read svn path=/trunk/; revision=4036 --- abstractions/Makefile | 232 +++++++------- abstractions/Makefile.buildlayout | 136 ++++----- abstractions/README | 26 +- doc/Makefile | 100 +++--- doc/Makefile.buildlayout | 136 ++++----- externals/Makefile | 389 ++++++++++++------------ externals/Makefile.buildlayout | 136 ++++----- externals/build/darwin/makefile | 12 +- packages/Makefile | 175 +++++------ packages/Makefile.buildlayout | 136 ++++----- packages/TODO | 8 + packages/darwin_app/Makefile | 196 ++++++------ packages/patches/build_vars_4_makefile.in.patch | 91 +++--- packages/win32_inno/Makefile | 10 +- 14 files changed, 904 insertions(+), 879 deletions(-) diff --git a/abstractions/Makefile b/abstractions/Makefile index a71fff6c..176da0fd 100644 --- a/abstractions/Makefile +++ b/abstractions/Makefile @@ -10,8 +10,8 @@ CWD := $(shell pwd) # these are designed to be overridden by the packages/Makefile -SRC_ROOT_DIR = $(CWD)/.. -INSTALL_PREFIX = build +cvs_root_dir = $(CWD)/.. +prefix = build BUILDLAYOUT_DIR = $(CWD) # default target @@ -29,13 +29,13 @@ include $(BUILDLAYOUT_DIR)/Makefile.buildlayout # clean up after everything is installed final_setup: - chmod -R ugo-w $(INSTALL_PREFIX) + chmod -R ugo-w $(prefix) -objects: $(OBJECTS_DEST) $(HELP_DEST) $(MANUALS_DEST) +objects: $(objectsdir) $(helpdir) $(manualsdir) objects: objects_gyre objects_keyboardkeys objects_la-kitchen objects_memento objects: objects_pddp objects_nusmuk objects_nqpoly objects_rradical -applications: $(APPLICATIONS_DEST) $(MANUALS_DEST) +applications: $(examplesdir) $(manualsdir) applications: applications_rradical applications_keyboardkeys applications_gyre @@ -49,137 +49,137 @@ applications: applications_rradical applications_keyboardkeys applications_gyre # GYRE GYRE_NAME = gyre objects_gyre: - install -d $(OBJECTS_DEST)/$(GYRE_NAME) - install -p $(ABSTRACTIONS_SRC)/audionerd/GYRE/gyre.*.pd \ - $(OBJECTS_DEST)/$(GYRE_NAME) - install -d $(MANUALS_DEST)/$(GYRE_NAME) - install -p $(ABSTRACTIONS_SRC)/audionerd/GYRE/gyre.html \ - $(MANUALS_DEST)/$(GYRE_NAME) + install -d $(objectsdir)/$(GYRE_NAME) + install -p $(abstractions_src)/audionerd/GYRE/gyre.*.pd \ + $(objectsdir)/$(GYRE_NAME) + install -d $(manualsdir)/$(GYRE_NAME) + install -p $(abstractions_src)/audionerd/GYRE/gyre.html \ + $(manualsdir)/$(GYRE_NAME) applications_gyre: - install -d $(APPLICATIONS_DEST)/$(GYRE_NAME) - install -p $(ABSTRACTIONS_SRC)/audionerd/GYRE/gyre.pd \ - $(APPLICATIONS_DEST)/$(GYRE_NAME) + install -d $(examplesdir)/$(GYRE_NAME) + install -p $(abstractions_src)/audionerd/GYRE/gyre.pd \ + $(examplesdir)/$(GYRE_NAME) #------------------------------------------------------------------------------- # keyboardkeys KEYBOARDKEYS_NAME = keyboardkeys objects_keyboardkeys: - install -d $(OBJECTS_DEST)/$(KEYBOARDKEYS_NAME) - install -p $(ABSTRACTIONS_SRC)/$(KEYBOARDKEYS_NAME)/abs/*.pd \ - $(OBJECTS_DEST)/$(KEYBOARDKEYS_NAME) - $(SCRIPTS_SRC)/generate-libdir-metafile.sh $(OBJECTS_DEST) $(KEYBOARDKEYS_NAME) \ + install -d $(objectsdir)/$(KEYBOARDKEYS_NAME) + install -p $(abstractions_src)/$(KEYBOARDKEYS_NAME)/abs/*.pd \ + $(objectsdir)/$(KEYBOARDKEYS_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(KEYBOARDKEYS_NAME) \ --author "Andrey Savitsky" \ --description "objects for using keyboard keys for scrolling and selecting" - install -d $(HELP_DEST)/$(KEYBOARDKEYS_NAME) - install -p $(ABSTRACTIONS_SRC)/$(KEYBOARDKEYS_NAME)/doc/*-help.pd \ - $(HELP_DEST)/$(KEYBOARDKEYS_NAME) + install -d $(helpdir)/$(KEYBOARDKEYS_NAME) + install -p $(abstractions_src)/$(KEYBOARDKEYS_NAME)/doc/*-help.pd \ + $(helpdir)/$(KEYBOARDKEYS_NAME) applications_keyboardkeys: - install -d $(APPLICATIONS_DEST)/$(KEYBOARDKEYS_NAME) - install -p $(ABSTRACTIONS_SRC)/$(KEYBOARDKEYS_NAME)/keyboard_main.pd \ - $(APPLICATIONS_DEST)/$(KEYBOARDKEYS_NAME) + install -d $(examplesdir)/$(KEYBOARDKEYS_NAME) + install -p $(abstractions_src)/$(KEYBOARDKEYS_NAME)/keyboard_main.pd \ + $(examplesdir)/$(KEYBOARDKEYS_NAME) #------------------------------------------------------------------------------- # la-kitchen LA-KITCHEN_NAME = la-kitchen objects_la-kitchen: - install -d $(OBJECTS_DEST)/$(LA-KITCHEN_NAME) - install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/La-kitchen/*.pd | \ - grep -v '\-help.pd') $(OBJECTS_DEST)/$(LA-KITCHEN_NAME) - $(SCRIPTS_SRC)/generate-libdir-metafile.sh $(OBJECTS_DEST) $(LA-KITCHEN_NAME) \ + install -d $(objectsdir)/$(LA-KITCHEN_NAME) + install -p $(shell ls -1 $(abstractions_src)/La-kitchen/*.pd | \ + grep -v '\-help.pd') $(objectsdir)/$(LA-KITCHEN_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(LA-KITCHEN_NAME) \ --author "Charles Verron" \ --description "a collection of objects working with sensors" - install -d $(HELP_DEST)/$(LA-KITCHEN_NAME) - install -p $(ABSTRACTIONS_SRC)/La-kitchen/*-help.pd \ - $(HELP_DEST)/$(LA-KITCHEN_NAME) - install -d $(MANUALS_DEST)/$(LA-KITCHEN_NAME) - install -p $(ABSTRACTIONS_SRC)/La-kitchen/readme.txt \ - $(MANUALS_DEST)/$(LA-KITCHEN_NAME) + install -d $(helpdir)/$(LA-KITCHEN_NAME) + install -p $(abstractions_src)/La-kitchen/*-help.pd \ + $(helpdir)/$(LA-KITCHEN_NAME) + install -d $(manualsdir)/$(LA-KITCHEN_NAME) + install -p $(abstractions_src)/La-kitchen/readme.txt \ + $(manualsdir)/$(LA-KITCHEN_NAME) #------------------------------------------------------------------------------- # memento MEMENTO_NAME = memento objects_memento: - install -d $(OBJECTS_DEST)/$(MEMENTO_NAME) - install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/rradical/memento/*.pd | \ - grep -v '\-help.pd') $(OBJECTS_DEST)/$(MEMENTO_NAME) - $(SCRIPTS_SRC)/generate-libdir-metafile.sh $(OBJECTS_DEST) $(MEMENTO_NAME) \ + install -d $(objectsdir)/$(MEMENTO_NAME) + install -p $(shell ls -1 $(abstractions_src)/rradical/memento/*.pd | \ + grep -v '\-help.pd') $(objectsdir)/$(MEMENTO_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(MEMENTO_NAME) \ --author "Frank Barknecht" \ --license "GNU GPL" \ --description "a collection of objects for managing state saving" - install -d $(HELP_DEST)/$(MEMENTO_NAME) - install -p $(ABSTRACTIONS_SRC)/rradical/memento/*-help.pd \ - $(HELP_DEST)/$(MEMENTO_NAME) - install -d $(MANUALS_DEST)/$(MEMENTO_NAME) - install -p $(ABSTRACTIONS_SRC)/rradical/memento/tutorial/*.* \ - $(MANUALS_DEST)/$(MEMENTO_NAME) - install -d $(APPLICATIONS_DEST)/$(MEMENTO_NAME) - install -p $(ABSTRACTIONS_SRC)/rradical/memento/examples/*.* \ - $(APPLICATIONS_DEST)/$(MEMENTO_NAME) + install -d $(helpdir)/$(MEMENTO_NAME) + install -p $(abstractions_src)/rradical/memento/*-help.pd \ + $(helpdir)/$(MEMENTO_NAME) + install -d $(manualsdir)/$(MEMENTO_NAME) + install -p $(abstractions_src)/rradical/memento/tutorial/*.* \ + $(manualsdir)/$(MEMENTO_NAME) + install -d $(examplesdir)/$(MEMENTO_NAME) + install -p $(abstractions_src)/rradical/memento/examples/*.* \ + $(examplesdir)/$(MEMENTO_NAME) #------------------------------------------------------------------------------- # nqpoly objects_nqpoly: objects_nqpoly~ objects_nqpoly4 # make a common target for the manuals so they are in one place - install -d $(MANUALS_DEST)/nqpoly - install -p $(ABSTRACTIONS_SRC)/nqpoly/*.html $(MANUALS_DEST)/nqpoly - install -p $(ABSTRACTIONS_SRC)/nqpoly/nqpoly~/readme.txt \ - $(MANUALS_DEST)/nqpoly/nqpoly~.txt + install -d $(manualsdir)/nqpoly + install -p $(abstractions_src)/nqpoly/*.html $(manualsdir)/nqpoly + install -p $(abstractions_src)/nqpoly/nqpoly~/readme.txt \ + $(manualsdir)/nqpoly/nqpoly~.txt NQPOLY_NAME = nqpoly~ objects_nqpoly~: - install -d $(OBJECTS_DEST)/$(NQPOLY_NAME) - install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/nqpoly/nqpoly~/*.pd | \ - grep -v '\-help.pd') $(OBJECTS_DEST)/$(NQPOLY_NAME) - install -d $(HELP_DEST)/$(NQPOLY_NAME) + install -d $(objectsdir)/$(NQPOLY_NAME) + install -p $(shell ls -1 $(abstractions_src)/nqpoly/nqpoly~/*.pd | \ + grep -v '\-help.pd') $(objectsdir)/$(NQPOLY_NAME) + install -d $(helpdir)/$(NQPOLY_NAME) # all of the patches should be installed into help since [nqpoly~] needs to be # in the same directory as the patches its manipulating - install -p $(ABSTRACTIONS_SRC)/nqpoly/nqpoly~/*.pd \ - $(HELP_DEST)/$(NQPOLY_NAME) - install -d $(APPLICATIONS_DEST)/$(NQPOLY_NAME) - install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/nqpoly/nqpoly~/*.pd | \ - grep -v '\-help.pd') $(APPLICATIONS_DEST)/$(NQPOLY_NAME) + install -p $(abstractions_src)/nqpoly/nqpoly~/*.pd \ + $(helpdir)/$(NQPOLY_NAME) + install -d $(examplesdir)/$(NQPOLY_NAME) + install -p $(shell ls -1 $(abstractions_src)/nqpoly/nqpoly~/*.pd | \ + grep -v '\-help.pd') $(examplesdir)/$(NQPOLY_NAME) NQPOLY4_NAME = nqpoly4 objects_nqpoly4: - install -d $(OBJECTS_DEST)/$(NQPOLY4_NAME) - install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/nqpoly/nqpoly4/*.pd | \ - grep -v '\-help.pd') $(OBJECTS_DEST)/$(NQPOLY4_NAME) - install -d $(HELP_DEST)/$(NQPOLY4_NAME) + install -d $(objectsdir)/$(NQPOLY4_NAME) + install -p $(shell ls -1 $(abstractions_src)/nqpoly/nqpoly4/*.pd | \ + grep -v '\-help.pd') $(objectsdir)/$(NQPOLY4_NAME) + install -d $(helpdir)/$(NQPOLY4_NAME) # all of the patches should be installed into help since [nqpoly4] needs to be # in the same directory as the patches its manipulating - install -p $(ABSTRACTIONS_SRC)/nqpoly/nqpoly4/*.pd $(HELP_DEST)/$(NQPOLY4_NAME) - install -d $(APPLICATIONS_DEST)/$(NQPOLY4_NAME) - install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/nqpoly/nqpoly4/*.pd | \ - grep -v '\-help.pd') $(APPLICATIONS_DEST)/$(NQPOLY4_NAME) + install -p $(abstractions_src)/nqpoly/nqpoly4/*.pd $(helpdir)/$(NQPOLY4_NAME) + install -d $(examplesdir)/$(NQPOLY4_NAME) + install -p $(shell ls -1 $(abstractions_src)/nqpoly/nqpoly4/*.pd | \ + grep -v '\-help.pd') $(examplesdir)/$(NQPOLY4_NAME) #------------------------------------------------------------------------------- # nusmuk NUSMUK_NAME = nusmuk objects_nusmuk: - install -d $(OBJECTS_DEST)/$(NUSMUK_NAME) - install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/nusmuk/*.pd | \ - grep -v '\-help.pd') $(OBJECTS_DEST)/$(NUSMUK_NAME) - $(SCRIPTS_SRC)/generate-libdir-metafile.sh $(OBJECTS_DEST) $(NUSMUK_NAME) \ + install -d $(objectsdir)/$(NUSMUK_NAME) + install -p $(shell ls -1 $(abstractions_src)/nusmuk/*.pd | \ + grep -v '\-help.pd') $(objectsdir)/$(NUSMUK_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(NUSMUK_NAME) \ --author "Cyrille Henry" \ --description "a collection of objects for physical modelling" - install -d $(HELP_DEST)/$(NUSMUK_NAME) - install -p $(ABSTRACTIONS_SRC)/nusmuk/*-help.pd \ - $(HELP_DEST)/$(NUSMUK_NAME) - install -p $(ABSTRACTIONS_SRC)/nusmuk/*.wav \ - $(HELP_DEST)/$(NUSMUK_NAME) + install -d $(helpdir)/$(NUSMUK_NAME) + install -p $(abstractions_src)/nusmuk/*-help.pd \ + $(helpdir)/$(NUSMUK_NAME) + install -p $(abstractions_src)/nusmuk/*.wav \ + $(helpdir)/$(NUSMUK_NAME) #------------------------------------------------------------------------------- # parazit - install -d $(OBJECTS_DEST) - install -p $(ABSTRACTIONS_SRC)/parazit/parazit.pd $(OBJECTS_DEST) + install -d $(objectsdir) + install -p $(abstractions_src)/parazit/parazit.pd $(objectsdir) @@ -187,54 +187,54 @@ objects_nusmuk: # PDDP support lib PDDP_NAME = pddp objects_pddp: - install -d $(OBJECTS_DEST)/$(PDDP_NAME) - install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/pddp/*.pd | \ - grep -v '\-help.pd') $(OBJECTS_DEST)/$(PDDP_NAME) - $(SCRIPTS_SRC)/generate-libdir-metafile.sh $(OBJECTS_DEST) $(PDDP_NAME) \ + install -d $(objectsdir)/$(PDDP_NAME) + install -p $(shell ls -1 $(abstractions_src)/pddp/*.pd | \ + grep -v '\-help.pd') $(objectsdir)/$(PDDP_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PDDP_NAME) \ --license "GNU GPL" \ --description "support objects for the Pure Data Documentation Project" - install -d $(HELP_DEST)/$(PDDP_NAME) - install -p $(ABSTRACTIONS_SRC)/pddp/*-help.pd \ - $(HELP_DEST)/$(PDDP_NAME) -# install -d $(MANUALS_DEST)/$(PDDP_NAME) -# install -d $(APPLICATIONS_DEST)/$(PDDP_NAME) + install -d $(helpdir)/$(PDDP_NAME) + install -p $(abstractions_src)/pddp/*-help.pd \ + $(helpdir)/$(PDDP_NAME) +# install -d $(manualsdir)/$(PDDP_NAME) +# install -d $(examplesdir)/$(PDDP_NAME) #------------------------------------------------------------------------------- # RRADical RRADICAL_NAME = rradical objects_rradical: - install -d $(OBJECTS_DEST)/$(RRADICAL_NAME) - $(SCRIPTS_SRC)/generate-libdir-metafile.sh $(OBJECTS_DEST) $(RRADICAL_NAME) \ + install -d $(objectsdir)/$(RRADICAL_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(RRADICAL_NAME) \ --author "Frank Barknecht" \ --license "GNU GPL" - install -d $(OBJECTS_DEST)/$(RRADICAL_NAME)/control - install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/rradical/control/*.* | \ - grep -v '\-help.pd') $(OBJECTS_DEST)/$(RRADICAL_NAME)/control - install -d $(OBJECTS_DEST)/$(RRADICAL_NAME)/effects - install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/rradical/effects/*.* | \ - grep -v '\-help.pd') $(OBJECTS_DEST)/$(RRADICAL_NAME)/effects - install -d $(OBJECTS_DEST)/$(RRADICAL_NAME)/instruments - install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/rradical/instruments/*.* | \ - grep -v '\-help.pd') $(OBJECTS_DEST)/$(RRADICAL_NAME)/instruments - install -d $(OBJECTS_DEST)/$(RRADICAL_NAME)/stuff - install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/rradical/stuff/*.* | \ - grep -v '\-help.pd') $(OBJECTS_DEST)/$(RRADICAL_NAME)/stuff + install -d $(objectsdir)/$(RRADICAL_NAME)/control + install -p $(shell ls -1 $(abstractions_src)/rradical/control/*.* | \ + grep -v '\-help.pd') $(objectsdir)/$(RRADICAL_NAME)/control + install -d $(objectsdir)/$(RRADICAL_NAME)/effects + install -p $(shell ls -1 $(abstractions_src)/rradical/effects/*.* | \ + grep -v '\-help.pd') $(objectsdir)/$(RRADICAL_NAME)/effects + install -d $(objectsdir)/$(RRADICAL_NAME)/instruments + install -p $(shell ls -1 $(abstractions_src)/rradical/instruments/*.* | \ + grep -v '\-help.pd') $(objectsdir)/$(RRADICAL_NAME)/instruments + install -d $(objectsdir)/$(RRADICAL_NAME)/stuff + install -p $(shell ls -1 $(abstractions_src)/rradical/stuff/*.* | \ + grep -v '\-help.pd') $(objectsdir)/$(RRADICAL_NAME)/stuff applications_rradical: - install -d $(APPLICATIONS_DEST)/$(RRADICAL_NAME) - install -p $(ABSTRACTIONS_SRC)/rradical/usecases/*.* \ - $(APPLICATIONS_DEST)/$(RRADICAL_NAME) - install -d $(APPLICATIONS_DEST)/$(RRADICAL_NAME)/showcase - install -p $(ABSTRACTIONS_SRC)/rradical/usecases/showcase/*.* \ - $(APPLICATIONS_DEST)/$(RRADICAL_NAME)/showcase - install -d $(APPLICATIONS_DEST)/$(RRADICAL_NAME)/showcase/impl - install -p $(ABSTRACTIONS_SRC)/rradical/usecases/showcase/impl/*.* \ - $(APPLICATIONS_DEST)/$(RRADICAL_NAME)/showcase/impl - install -d $(APPLICATIONS_DEST)/$(RRADICAL_NAME)/showcase/songs - install -p $(ABSTRACTIONS_SRC)/rradical/usecases/showcase/songs/*.* \ - $(APPLICATIONS_DEST)/$(RRADICAL_NAME)/showcase/songs + install -d $(examplesdir)/$(RRADICAL_NAME) + install -p $(abstractions_src)/rradical/usecases/*.* \ + $(examplesdir)/$(RRADICAL_NAME) + install -d $(examplesdir)/$(RRADICAL_NAME)/showcase + install -p $(abstractions_src)/rradical/usecases/showcase/*.* \ + $(examplesdir)/$(RRADICAL_NAME)/showcase + install -d $(examplesdir)/$(RRADICAL_NAME)/showcase/impl + install -p $(abstractions_src)/rradical/usecases/showcase/impl/*.* \ + $(examplesdir)/$(RRADICAL_NAME)/showcase/impl + install -d $(examplesdir)/$(RRADICAL_NAME)/showcase/songs + install -p $(abstractions_src)/rradical/usecases/showcase/songs/*.* \ + $(examplesdir)/$(RRADICAL_NAME)/showcase/songs #==============================================================================# # @@ -248,9 +248,9 @@ devsymlinks: devsymlinks_keyboardkeys devsymlinks_keyboardkeys: ln -s abs \ - $(ABSTRACTIONS_SRC)/keyboardkeys/keyboardkeys + $(abstractions_src)/keyboardkeys/keyboardkeys ln -s ../keyboardkeys \ - $(ABSTRACTIONS_SRC)/keyboardkeys/doc/keyboardkeys + $(abstractions_src)/keyboardkeys/doc/keyboardkeys #==============================================================================# # diff --git a/abstractions/Makefile.buildlayout b/abstractions/Makefile.buildlayout index 12df9df5..4e386afc 100755 --- a/abstractions/Makefile.buildlayout +++ b/abstractions/Makefile.buildlayout @@ -9,12 +9,12 @@ # This file should be exactly the same in each section of the CVS. A copy is # 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). +# Makefile.buildlayout") and then define $(prefix) and $(cvs_root_dir). # -# $(SRC_ROOT_DIR) is the base directory of src tree, equivalent to the root +# $(cvs_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 +# $(prefix) is the base directory to where all of the resulting files # will be copied. # # This file is currently located in these places: @@ -63,27 +63,27 @@ endif #==============================================================================# # 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 +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 -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 +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 #==============================================================================# @@ -93,23 +93,23 @@ MANUALS_DEST = $(DOCS_DEST)/manuals #==============================================================================# # first make sure that the directory structure is setup -$(INSTALL_PREFIX): - install -d $(INSTALL_PREFIX) +$(prefix): + install -d $(prefix) -$(APPLICATIONS_DEST): $(INSTALL_PREFIX) - install -d $(APPLICATIONS_DEST) +$(examplesdir): $(prefix) + install -d $(examplesdir) -$(DOCS_DEST): $(INSTALL_PREFIX) - install -d $(DOCS_DEST) +$(pddocdir): $(prefix) + install -d $(pddocdir) -$(HELP_DEST): $(INSTALL_PREFIX) - install -d $(HELP_DEST) +$(helpdir): $(prefix) + install -d $(helpdir) -$(MANUALS_DEST): $(INSTALL_PREFIX) - install -d $(MANUALS_DEST) +$(manualsdir): $(prefix) + install -d $(manualsdir) -$(OBJECTS_DEST): $(INSTALL_PREFIX) - install -d $(OBJECTS_DEST) +$(objectsdir): $(prefix) + install -d $(objectsdir) #==============================================================================# @@ -119,11 +119,11 @@ $(OBJECTS_DEST): $(INSTALL_PREFIX) #==============================================================================# -PD_MAJOR_VERSION := $(shell grep 'Pd version' $(PD_SRC)/src/s_main.c | \ +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 | \ +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 | \ +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 PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) @@ -142,51 +142,51 @@ PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION) #==============================================================================# 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) + -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 -- $(HELP_DEST)/*/*/*.* - -rm -f -- $(HELP_DEST)/*/*.* - -rm -f -- $(HELP_DEST)/*.* - -rmdir $(HELP_DEST)/*/* - -rmdir $(HELP_DEST)/* - -rmdir $(HELP_DEST) + -rm -f -- $(helpdir)/*/*/*.* + -rm -f -- $(helpdir)/*/*.* + -rm -f -- $(helpdir)/*.* + -rmdir $(helpdir)/*/* + -rmdir $(helpdir)/* + -rmdir $(helpdir) manuals_clean: - -rm -f -- $(MANUALS_DEST)/*/*/*.* - -rm -f -- $(MANUALS_DEST)/*/*.* - -rmdir $(MANUALS_DEST)/*/* - -rmdir $(MANUALS_DEST)/* - -rmdir $(MANUALS_DEST) + -rm -f -- $(manualsdir)/*/*/*.* + -rm -f -- $(manualsdir)/*/*.* + -rmdir $(manualsdir)/*/* + -rmdir $(manualsdir)/* + -rmdir $(manualsdir) 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) + -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 $(DOCS_DEST) - -rmdir $(INSTALL_PREFIX) + -rmdir $(pddocdir) + -rmdir $(prefix) @echo " " - @echo "Build destination cleaned: $(INSTALL_PREFIX)" + @echo "Build destination cleaned: $(prefix)" cruft_clean: diff --git a/abstractions/README b/abstractions/README index 187a4382..7e997cfc 100644 --- a/abstractions/README +++ b/abstractions/README @@ -64,23 +64,23 @@ edit the paths of the files that you want to include. The paths will be the only text written out. All of the installation paths will be Makefile variables. Check the below example: - install -d $(HELP_DEST)/$(MEMENTO_NAME) - install -p $(ABSTRACTIONS_SRC)/rradical/memento/*-help.pd \ - $(HELP_DEST)/$(MEMENTO_NAME) + install -d $(helpdir)/$(MEMENTO_NAME) + install -p $(abstractions_src)/rradical/memento/*-help.pd \ + $(helpdir)/$(MEMENTO_NAME) becomes: - install -d $(HELP_DEST)/$(MYLIBRARY_NAME) - install -p $(ABSTRACTIONS_SRC)/mylibrary/*-help.pd \ - $(HELP_DEST)/$(MYLIBRARY_NAME) + install -d $(helpdir)/$(MYLIBRARY_NAME) + install -p $(abstractions_src)/mylibrary/*-help.pd \ + $(helpdir)/$(MYLIBRARY_NAME) Also, since it is common to store the help patches in the same directory as the object patchs, you can use this pattern to exclude the help patches from -being copied to $(OBJECTS_DEST): +being copied to $(objectsdir): - install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/mylibrary/*.pd | \ - grep -v '\-help.pd') $(OBJECTS_DEST)/$(MYLIBRARY_NAME) + install -p $(shell ls -1 $(abstractions_src)/mylibrary/*.pd | \ + grep -v '\-help.pd') $(objectsdir)/$(MYLIBRARY_NAME) @@ -96,7 +96,7 @@ MYLIBRARY_NAME = mylibrary of objects within Pd (e.g. [mylibrary/myobject]). -$(APPLICATIONS_DEST): +$(examplesdir): If your project is an application or patch that is meant to be run directly, then it should go into this directory in its own subdirectory. @@ -107,7 +107,7 @@ $(APPLICATIONS_DEST): appropriate in directory names. -$(DOCS_DEST): +$(pddocdir): All help patches should go into this directory in a subdirectory with the same nameas the subdirectory for your objects. For example, for [mylibrary/myobject] above, the helpfile would be "mylibrary/myobject-help.pd". @@ -115,7 +115,7 @@ $(DOCS_DEST): The subdirectory name (e.g. mylibrary) should always be all lowercase. -$(MANUALS_DEST): +$(manualsdir): If you have any other kinds of documentation, like a text or HTML manual, or a Pd-based tutorial, then it should go into this directory, again in a @@ -126,7 +126,7 @@ $(MANUALS_DEST): The subdirectory name (e.g. mylibrary) should always be all lowercase. -$(OBJECTS_DEST): +$(objectsdir): If your project consists of objects that are meant to be reused in other patches rather than used as a application, then they should go into this diff --git a/doc/Makefile b/doc/Makefile index e66a73db..527601c6 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -10,8 +10,8 @@ CWD := $(shell pwd) # these are designed to be overridden by the packages/Makefile -SRC_ROOT_DIR = $(CWD)/.. -INSTALL_PREFIX = build +cvs_root_dir = $(CWD)/.. +prefix = build BUILDLAYOUT_DIR = $(CWD) # default target @@ -28,7 +28,7 @@ include $(BUILDLAYOUT_DIR)/Makefile.buildlayout # clean up after everything is installed final_setup: - chmod -R ugo-w $(DOCS_DEST) + chmod -R ugo-w $(pddocdir) install: pd_fileformat_install pd-msg_install pddp_install tutorials_install @echo " " @@ -43,15 +43,15 @@ install: pd_fileformat_install pd-msg_install pddp_install tutorials_install #------------------------------------------------------------------------------# # 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 \ +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 $(MANUALS_DEST)/$(PD-MSG_NAME)/$$dir; \ - install -p $(DOC_SRC)/additional/pd-msg/$$dir/*.* \ - $(MANUALS_DEST)/$(PD-MSG_NAME)/$$dir; \ + install -d $(manualsdir)/$(PD-MSG_NAME)/$$dir; \ + install -p $(doc_src)/additional/pd-msg/$$dir/*.* \ + $(manualsdir)/$(PD-MSG_NAME)/$$dir; \ done @@ -59,60 +59,60 @@ pd-msg_install: $(MANUALS_DEST) #------------------------------------------------------------------------------# # PD_FILEFORMAT PD_FILEFORMAT_NAME = Pd -pd_fileformat_install: $(MANUALS_DEST) - install -d $(MANUALS_DEST)/$(PD_FILEFORMAT_NAME) +pd_fileformat_install: $(manualsdir) + install -d $(manualsdir)/$(PD_FILEFORMAT_NAME) curl http://student-kmt.hku.nl/%7Etjeerd/pd/pd_fileformat.html > \ - $(MANUALS_DEST)/$(PD_FILEFORMAT_NAME)/Pd_File_Format.html + $(manualsdir)/$(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) +externals-howto_install: $(manualsdir) + install -d $(manualsdir)/$(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 + $(manualsdir)/$(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 + $(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node1.html curl http://iem.kug.ac.at/pd/externals-HOWTO/node2.html > \ - $(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node2.html + $(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node2.html curl http://iem.kug.ac.at/pd/externals-HOWTO/node3.html > \ - $(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node3.html + $(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node3.html curl http://iem.kug.ac.at/pd/externals-HOWTO/node4.html > \ - $(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node.html + $(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node.html curl http://iem.kug.ac.at/pd/externals-HOWTO/node5.html > \ - $(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node5.html + $(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node5.html curl http://iem.kug.ac.at/pd/externals-HOWTO/node6.html > \ - $(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node6.html + $(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node6.html curl http://iem.kug.ac.at/pd/externals-HOWTO/node7.html > \ - $(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node7.html + $(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node7.html curl http://iem.kug.ac.at/pd/externals-HOWTO/node8.html > \ - $(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node8.html + $(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node8.html curl http://iem.kug.ac.at/pd/externals-HOWTO/node9.html > \ - $(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node9.html + $(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node9.html curl http://iem.kug.ac.at/pd/externals-HOWTO/node10.html > \ - $(MANUALS_DEST)/$(EXTERNALS-HOWTO_NAME)/node10.html + $(manualsdir)/$(EXTERNALS-HOWTO_NAME)/node10.html #------------------------------------------------------------------------------# # PDDP -pddp_install: $(HELP_DEST) - install -p $(DOC_SRC)/pddp/*.pd $(HELP_DEST) +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 $(HELP_DEST) + install -p $(doc_src)/pddp/keyboard_fun.txt $(helpdir) #------------------------------------------------------------------------------# # TUTORIALS -tutorials_install: $(MANUALS_DEST) +tutorials_install: $(manualsdir) # pddrums - install -d $(MANUALS_DEST)/PdDrums - install -p $(DOC_SRC)/tutorials/footils/pddrums/*.* $(MANUALS_DEST)/PdDrums + install -d $(manualsdir)/PdDrums + install -p $(doc_src)/tutorials/footils/pddrums/*.* $(manualsdir)/PdDrums # playnow - install -d $(MANUALS_DEST)/PlayNow - install -p $(DOC_SRC)/tutorials/playnow/*.pd $(MANUALS_DEST)/PlayNow + install -d $(manualsdir)/PlayNow + install -p $(doc_src)/tutorials/playnow/*.pd $(manualsdir)/PlayNow # these aren't needed yet -# install -p $(DOC_SRC)/tutorials/playnow/*.mid $(MANUALS_DEST)/PlayNow +# install -p $(doc_src)/tutorials/playnow/*.mid $(manualsdir)/PlayNow #==============================================================================# @@ -123,23 +123,23 @@ tutorials_install: $(MANUALS_DEST) # 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 + 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 + 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 + 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 + test -e $(doc_src)/pddp/pddp || \ + ln -s $(abstractions_src)/pddp $(doc_src)/pddp/pddp #==============================================================================# # diff --git a/doc/Makefile.buildlayout b/doc/Makefile.buildlayout index 12df9df5..4e386afc 100644 --- a/doc/Makefile.buildlayout +++ b/doc/Makefile.buildlayout @@ -9,12 +9,12 @@ # This file should be exactly the same in each section of the CVS. A copy is # 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). +# Makefile.buildlayout") and then define $(prefix) and $(cvs_root_dir). # -# $(SRC_ROOT_DIR) is the base directory of src tree, equivalent to the root +# $(cvs_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 +# $(prefix) is the base directory to where all of the resulting files # will be copied. # # This file is currently located in these places: @@ -63,27 +63,27 @@ endif #==============================================================================# # 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 +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 -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 +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 #==============================================================================# @@ -93,23 +93,23 @@ MANUALS_DEST = $(DOCS_DEST)/manuals #==============================================================================# # first make sure that the directory structure is setup -$(INSTALL_PREFIX): - install -d $(INSTALL_PREFIX) +$(prefix): + install -d $(prefix) -$(APPLICATIONS_DEST): $(INSTALL_PREFIX) - install -d $(APPLICATIONS_DEST) +$(examplesdir): $(prefix) + install -d $(examplesdir) -$(DOCS_DEST): $(INSTALL_PREFIX) - install -d $(DOCS_DEST) +$(pddocdir): $(prefix) + install -d $(pddocdir) -$(HELP_DEST): $(INSTALL_PREFIX) - install -d $(HELP_DEST) +$(helpdir): $(prefix) + install -d $(helpdir) -$(MANUALS_DEST): $(INSTALL_PREFIX) - install -d $(MANUALS_DEST) +$(manualsdir): $(prefix) + install -d $(manualsdir) -$(OBJECTS_DEST): $(INSTALL_PREFIX) - install -d $(OBJECTS_DEST) +$(objectsdir): $(prefix) + install -d $(objectsdir) #==============================================================================# @@ -119,11 +119,11 @@ $(OBJECTS_DEST): $(INSTALL_PREFIX) #==============================================================================# -PD_MAJOR_VERSION := $(shell grep 'Pd version' $(PD_SRC)/src/s_main.c | \ +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 | \ +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 | \ +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 PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) @@ -142,51 +142,51 @@ PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION) #==============================================================================# 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) + -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 -- $(HELP_DEST)/*/*/*.* - -rm -f -- $(HELP_DEST)/*/*.* - -rm -f -- $(HELP_DEST)/*.* - -rmdir $(HELP_DEST)/*/* - -rmdir $(HELP_DEST)/* - -rmdir $(HELP_DEST) + -rm -f -- $(helpdir)/*/*/*.* + -rm -f -- $(helpdir)/*/*.* + -rm -f -- $(helpdir)/*.* + -rmdir $(helpdir)/*/* + -rmdir $(helpdir)/* + -rmdir $(helpdir) manuals_clean: - -rm -f -- $(MANUALS_DEST)/*/*/*.* - -rm -f -- $(MANUALS_DEST)/*/*.* - -rmdir $(MANUALS_DEST)/*/* - -rmdir $(MANUALS_DEST)/* - -rmdir $(MANUALS_DEST) + -rm -f -- $(manualsdir)/*/*/*.* + -rm -f -- $(manualsdir)/*/*.* + -rmdir $(manualsdir)/*/* + -rmdir $(manualsdir)/* + -rmdir $(manualsdir) 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) + -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 $(DOCS_DEST) - -rmdir $(INSTALL_PREFIX) + -rmdir $(pddocdir) + -rmdir $(prefix) @echo " " - @echo "Build destination cleaned: $(INSTALL_PREFIX)" + @echo "Build destination cleaned: $(prefix)" cruft_clean: diff --git a/externals/Makefile b/externals/Makefile index 1679d981..98ffd30c 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -11,8 +11,8 @@ CWD := $(shell pwd) # these are setup to be overridden by the packages/Makefile -SRC_ROOT_DIR = $(CWD)/.. -INSTALL_PREFIX = $(CWD)/build +cvs_root_dir = $(CWD)/.. +prefix = $(CWD)/build BUILDLAYOUT_DIR = $(CWD) # default target @@ -27,8 +27,8 @@ include $(BUILDLAYOUT_DIR)/Makefile.buildlayout # these are sent to all of the various Makefiles so that they all copy their # output to the same directory tree DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \ - SRC_ROOT_DIR=$(SRC_ROOT_DIR) \ - INSTALL_PREFIX=$(INSTALL_PREFIX) + cvs_root_dir=$(cvs_root_dir) \ + prefix=$(prefix) #==============================================================================# # @@ -42,7 +42,7 @@ all: pre_all_$(OS_NAME) creb cyclone iemabs iemlib iemmatrix pddp pdp pmpd \ toxy vbap zexy @echo "Compiling objects for $(OS_NAME) aka $(UNAME)" # try it this way so that it'll recognize files that have already been built - cd $(EXTERNALS_SRC)/build/$(OS_NAME) && make -k + cd $(externals_src)/build/$(OS_NAME) && make -k # these targets are for platform-specific needs that run before objects: pre_all_darwin: @@ -57,15 +57,15 @@ pre_all_unknown: #------------------------------------------------------------------------------# # INSTALL -install: all $(OBJECTS_DEST) help_install objects_install unfiltered_install \ +install: all $(objectsdir) help_install objects_install unfiltered_install \ creb_install cyclone_install iemabs_install iemabs_install iemmatrix_install \ pddp_install pdp_install pmpd_install toxy_install vbap_install zexy_install @echo " " @echo "externals install succeeded!" objects_install: - cd $(EXTERNALS_SRC)/build/$(OS_NAME)/ && \ - install -p *.$(EXTENSION) $(OBJECTS_DEST) + cd $(externals_src)/build/$(OS_NAME)/ && \ + install -p *.$(EXTENSION) $(objectsdir) #==============================================================================# @@ -75,60 +75,60 @@ objects_install: #==============================================================================# -help_install: $(HELP_DEST) +help_install: $(helpdir) #------------------------------------------------------------------------------# # all standard objs' help files # it had to be broken up because the list is soo long install -p \ - $(EXTERNALS_SRC)/OSCx/doc/*.pd \ - $(EXTERNALS_SRC)/aenv~/*.pd \ - $(EXTERNALS_SRC)/arraysize/*.pd \ - $(EXTERNALS_SRC)/beatpipe/*.pd \ - $(EXTERNALS_SRC)/control/*/*.pd \ - $(EXTERNALS_SRC)/bbogart/chaos/tools/*.pd \ - $(EXTERNALS_SRC)/bbogart/*/*.pd \ - $(EXTERNALS_SRC)/creb/doc/*.pd \ - $(HELP_DEST) + $(externals_src)/OSCx/doc/*.pd \ + $(externals_src)/aenv~/*.pd \ + $(externals_src)/arraysize/*.pd \ + $(externals_src)/beatpipe/*.pd \ + $(externals_src)/control/*/*.pd \ + $(externals_src)/bbogart/chaos/tools/*.pd \ + $(externals_src)/bbogart/*/*.pd \ + $(externals_src)/creb/doc/*.pd \ + $(helpdir) install -p \ - $(EXTERNALS_SRC)/creb/doc/examples/*.pd \ - $(EXTERNALS_SRC)/cxc/reference/*.pd \ - $(EXTERNALS_SRC)/dfx/*/*.pd \ - $(EXTERNALS_SRC)/ext13/doc/*.pd \ - $(EXTERNALS_SRC)/ggee/*/*-help.pd \ - $(EXTERNALS_SRC)/gem2pdp/*.pd \ - $(EXTERNALS_SRC)/ff/*.pd \ - $(EXTERNALS_SRC)/freeverb~/*.pd \ - $(EXTERNALS_SRC)/hcs/*-help.pd \ - $(HELP_DEST) + $(externals_src)/creb/doc/examples/*.pd \ + $(externals_src)/cxc/reference/*.pd \ + $(externals_src)/dfx/*/*.pd \ + $(externals_src)/ext13/doc/*.pd \ + $(externals_src)/ggee/*/*-help.pd \ + $(externals_src)/gem2pdp/*.pd \ + $(externals_src)/ff/*.pd \ + $(externals_src)/freeverb~/*.pd \ + $(externals_src)/hcs/*-help.pd \ + $(helpdir) install -p \ - $(EXTERNALS_SRC)/hcs/*/doc/*.pd \ - $(EXTERNALS_SRC)/hcs/hid/examples/*.pd \ - $(EXTERNALS_SRC)/hcs/pan/*-help.pd \ - $(EXTERNALS_SRC)/iem/comport/*/*-help.pd \ - $(EXTERNALS_SRC)/markex/*.pd \ - $(EXTERNALS_SRC)/motex/*.pd \ - $(EXTERNALS_SRC)/nusmuk/line3/*.pd\ - $(HELP_DEST) + $(externals_src)/hcs/*/doc/*.pd \ + $(externals_src)/hcs/hid/examples/*.pd \ + $(externals_src)/hcs/pan/*-help.pd \ + $(externals_src)/iem/comport/*/*-help.pd \ + $(externals_src)/markex/*.pd \ + $(externals_src)/motex/*.pd \ + $(externals_src)/nusmuk/line3/*.pd\ + $(helpdir) install -p \ - $(EXTERNALS_SRC)/pdogg/*/*.pd \ - $(EXTERNALS_SRC)/plugin~/*.pd \ - $(EXTERNALS_SRC)/rhythm_estimator/*.p? \ - $(EXTERNALS_SRC)/signal/*/*.pd \ - $(EXTERNALS_SRC)/sprinkler/sprinkler-help.pd \ - $(EXTERNALS_SRC)/susloop~/*.pd \ - $(EXTERNALS_SRC)/svf~/*.pd \ - $(EXTERNALS_SRC)/vbap/*.pd \ - $(EXTERNALS_SRC)/vst/*.pd \ - $(EXTERNALS_SRC)/zhzxh~/*.pd \ - $(HELP_DEST) + $(externals_src)/pdogg/*/*.pd \ + $(externals_src)/plugin~/*.pd \ + $(externals_src)/rhythm_estimator/*.p? \ + $(externals_src)/signal/*/*.pd \ + $(externals_src)/sprinkler/sprinkler-help.pd \ + $(externals_src)/susloop~/*.pd \ + $(externals_src)/svf~/*.pd \ + $(externals_src)/vbap/*.pd \ + $(externals_src)/vst/*.pd \ + $(externals_src)/zhzxh~/*.pd \ + $(helpdir) #------------------------------------------------------------------------------# # mjlib [prob] conflicts with cyclone's [prob] so filter it - install -p $(shell ls -1 $(EXTERNALS_SRC)/mjlib/doc/*.* | \ - grep -v 'prob') $(HELP_DEST) + install -p $(shell ls -1 $(externals_src)/mjlib/doc/*.* | \ + grep -v 'prob') $(helpdir) #------------------------------------------------------------------------------# # maxlib [split] conflicts with cyclone so filter it - install -p $(shell ls -1 $(EXTERNALS_SRC)/maxlib/help/*.* | \ - grep -v 'split') $(HELP_DEST) + install -p $(shell ls -1 $(externals_src)/maxlib/help/*.* | \ + grep -v 'split') $(helpdir) @@ -146,10 +146,10 @@ template: template_install: template - install -d $(OBJECTS_DEST)/$(TEMPLATE_NAME) - install -d $(HELP_DEST)/$(TEMPLATE_NAME) - install -d $(MANUALS_DEST)/$(TEMPLATE_NAME) - install -d $(APPLICATIONS_DEST)/$(TEMPLATE_NAME) + install -d $(objectsdir)/$(TEMPLATE_NAME) + install -d $(helpdir)/$(TEMPLATE_NAME) + install -d $(manualsdir)/$(TEMPLATE_NAME) + install -d $(examplesdir)/$(TEMPLATE_NAME) #------------------------------------------------------------------------------# @@ -159,13 +159,13 @@ creb: creb_install: creb - install -d $(OBJECTS_DEST)/$(CREB_NAME) - install -p $(EXTERNALS_SRC)/creb/abs/*.pd $(OBJECTS_DEST)/$(CREB_NAME) - install -d $(HELP_DEST)/$(CREB_NAME) - install -p -m0644 $(EXTERNALS_SRC)/creb/doc/examples/*.* \ - $(HELP_DEST)/$(CREB_NAME) -# install -d $(MANUALS_DEST)/$(CREB_NAME) -# install -d $(APPLICATIONS_DEST)/$(CREB_NAME) + install -d $(objectsdir)/$(CREB_NAME) + install -p $(externals_src)/creb/abs/*.pd $(objectsdir)/$(CREB_NAME) + install -d $(helpdir)/$(CREB_NAME) + install -p -m0644 $(externals_src)/creb/doc/examples/*.* \ + $(helpdir)/$(CREB_NAME) +# install -d $(manualsdir)/$(CREB_NAME) +# install -d $(examplesdir)/$(CREB_NAME) @@ -173,32 +173,32 @@ creb_install: creb # CYCLONE CYCLONE_NAME=cyclone # cyclone is compiled straight into $(OUT_DIR) -CYCLONE_OUT_DIR=$(OBJECTS_DEST)/$(CYCLONE_NAME) +CYCLONE_OUT_DIR=$(objectsdir)/$(CYCLONE_NAME) cyclone: cyclone_install: cyclone - install -d $(OBJECTS_DEST)/$(CYCLONE_NAME) - $(SCRIPTS_SRC)/generate-libdir-metafile.sh $(OBJECTS_DEST) $(CYCLONE_NAME) \ + install -d $(objectsdir)/$(CYCLONE_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(CYCLONE_NAME) \ --author "Kzrysztof Czaja" \ --license "BSD" \ --description "a library for porting and running Max/MSP patches in Pd" - cd $(EXTERNALS_SRC)/miXed/cyclone && $(MAKE) OUT_DIR=$(CYCLONE_OUT_DIR) + cd $(externals_src)/miXed/cyclone && $(MAKE) OUT_DIR=$(CYCLONE_OUT_DIR) # install "cyclist" command line app with pd - install -d $(BIN_DEST) + install -d $(bindir) # this doesn't build in the right place yet -# install -p -m0755 $(CYCLONE_OUT_DIR)/cyclist $(BIN_DEST) && \ +# install -p -m0755 $(CYCLONE_OUT_DIR)/cyclist $(bindir) && \ # rm $(CYCLONE_OUT_DIR)/cyclist # rename cyclone lib since it will pre-empt libdir functionality - mv $(CYCLONE_OUT_DIR)/cyclone.$(EXTENSION) \ - $(CYCLONE_OUT_DIR)/cyclonelib.$(EXTENSION) - install -d $(HELP_DEST)/$(CYCLONE_NAME) - install -p $(EXTERNALS_SRC)/miXed/doc/help/cyclone/*.* \ - $(HELP_DEST)/$(CYCLONE_NAME) -# install -d $(MANUALS_DEST)/$(CYCLONE_NAME) - install -d $(APPLICATIONS_DEST)/$(CYCLONE_NAME) - install -p $(EXTERNALS_SRC)/miXed/test/cyclone/*.* \ - $(APPLICATIONS_DEST)/$(CYCLONE_NAME) +# mv $(CYCLONE_OUT_DIR)/cyclone.$(EXTENSION) \ +# $(CYCLONE_OUT_DIR)/cyclonelib.$(EXTENSION) + install -d $(helpdir)/$(CYCLONE_NAME) + install -p $(externals_src)/miXed/doc/help/cyclone/*.* \ + $(helpdir)/$(CYCLONE_NAME) +# install -d $(manualsdir)/$(CYCLONE_NAME) + install -d $(examplesdir)/$(CYCLONE_NAME) + install -p $(externals_src)/miXed/test/cyclone/*.* \ + $(examplesdir)/$(CYCLONE_NAME) @@ -212,19 +212,19 @@ iemabs: iemabs_install: iemabs # iemabs still has the help patches in the old help-*.pd style - install -d $(OBJECTS_DEST)/$(IEMABS_NAME) - $(SCRIPTS_SRC)/generate-libdir-metafile.sh $(OBJECTS_DEST) $(IEMABS_NAME) \ + install -d $(objectsdir)/$(IEMABS_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(IEMABS_NAME) \ --description "a collection of objects written at IEM/KUG" - install -p $(shell ls -1 $(EXTERNALS_SRC)/iemlib/iemabs/*.pd | \ - grep -v 'help') $(OBJECTS_DEST)/$(IEMABS_NAME) - install -d $(HELP_DEST)/$(IEMABS_NAME) - install -p $(EXTERNALS_SRC)/iemlib/iemabs/*help*.pd \ - $(HELP_DEST)/$(IEMABS_NAME) - install -p $(EXTERNALS_SRC)/iemlib/iemabs/*.mp3 $(HELP_DEST)/$(IEMABS_NAME) - install -p $(EXTERNALS_SRC)/iemlib/iemabs/*.wav $(HELP_DEST)/$(IEMABS_NAME) - install -d $(MANUALS_DEST)/$(IEMABS_NAME) - install -p $(EXTERNALS_SRC)/iemlib/iemabs/*.txt \ - $(MANUALS_DEST)/$(IEMABS_NAME) + install -p $(shell ls -1 $(externals_src)/iemlib/iemabs/*.pd | \ + grep -v 'help') $(objectsdir)/$(IEMABS_NAME) + install -d $(helpdir)/$(IEMABS_NAME) + install -p $(externals_src)/iemlib/iemabs/*help*.pd \ + $(helpdir)/$(IEMABS_NAME) + install -p $(externals_src)/iemlib/iemabs/*.mp3 $(helpdir)/$(IEMABS_NAME) + install -p $(externals_src)/iemlib/iemabs/*.wav $(helpdir)/$(IEMABS_NAME) + install -d $(manualsdir)/$(IEMABS_NAME) + install -p $(externals_src)/iemlib/iemabs/*.txt \ + $(manualsdir)/$(IEMABS_NAME) @@ -235,14 +235,14 @@ iemlib: iemlib_install: iemlib -# install -d $(OBJECTS_DEST)/$(IEMLIB_NAME) -# install -d $(HELP_DEST)/$(IEMLIB_NAME) - install -d $(HELP_DEST)/iemhelp - install -p $(EXTERNALS_SRC)/iemlib/iemhelp/*.* $(HELP_DEST)/iemhelp -# install -d $(MANUALS_DEST)/$(IEMLIB_NAME) - install -d $(APPLICATIONS_DEST)/$(IEMLIB_NAME) - install -p $(EXTERNALS_SRC)/iemlib/examples/*.* \ - $(APPLICATIONS_DEST)/$(IEMLIB_NAME) +# install -d $(objectsdir)/$(IEMLIB_NAME) +# install -d $(helpdir)/$(IEMLIB_NAME) + install -d $(helpdir)/iemhelp + install -p $(externals_src)/iemlib/iemhelp/*.* $(helpdir)/iemhelp +# install -d $(manualsdir)/$(IEMLIB_NAME) + install -d $(examplesdir)/$(IEMLIB_NAME) + install -p $(externals_src)/iemlib/examples/*.* \ + $(examplesdir)/$(IEMLIB_NAME) @@ -253,15 +253,15 @@ iemmatrix: iemmatrix_install: iemmatrix - install -d $(OBJECTS_DEST)/$(IEMMATRIX_NAME) - $(SCRIPTS_SRC)/generate-libdir-metafile.sh $(OBJECTS_DEST) $(IEMMATRIX_NAME) \ + install -d $(objectsdir)/$(IEMMATRIX_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(IEMMATRIX_NAME) \ --description "objects for matrix operations and math" - mv $(OBJECTS_DEST)/mtx*.$(EXTENSION) $(OBJECTS_DEST)/$(IEMMATRIX_NAME) - install -p $(shell ls -1 $(EXTERNALS_SRC)/iem/iemmatrix/abs/*.* | \ - grep -v '\-help.pd') $(OBJECTS_DEST)/$(IEMMATRIX_NAME) - install -d $(HELP_DEST)/$(IEMMATRIX_NAME) - install -p $(EXTERNALS_SRC)/iem/iemmatrix/doc/*.pd \ - $(HELP_DEST)/$(IEMMATRIX_NAME) + mv $(objectsdir)/mtx*.$(EXTENSION) $(objectsdir)/$(IEMMATRIX_NAME) + install -p $(shell ls -1 $(externals_src)/iem/iemmatrix/abs/*.* | \ + grep -v '\-help.pd') $(objectsdir)/$(IEMMATRIX_NAME) + install -d $(helpdir)/$(IEMMATRIX_NAME) + install -p $(externals_src)/iem/iemmatrix/doc/*.pd \ + $(helpdir)/$(IEMMATRIX_NAME) @@ -269,22 +269,22 @@ iemmatrix_install: iemmatrix # PDDP PDDP_NAME=pddp # pddp is compiled straight into $(OUT_DIR) -PDDP_OUT_DIR=$(OBJECTS_DEST)/$(PDDP_NAME) +PDDP_OUT_DIR=$(objectsdir)/$(PDDP_NAME) pddp: pddp_install: pddp - install -d $(OBJECTS_DEST)/$(PDDP_NAME) - $(SCRIPTS_SRC)/generate-libdir-metafile.sh $(OBJECTS_DEST) $(PDDP_NAME) \ + install -d $(objectsdir)/$(PDDP_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PDDP_NAME) \ --author "PDDP" \ --license "BSD" \ --description "objects for working with Tcl and Pd's Tk GUI" - cd $(EXTERNALS_SRC)/miXed/pddp && $(MAKE) OUT_DIR=$(PDDP_OUT_DIR) -# install -d $(HELP_DEST)/$(PDDP_NAME) -# install -d $(MANUALS_DEST)/$(PDDP_NAME) - install -d $(APPLICATIONS_DEST)/$(PDDP_NAME) - install -p $(EXTERNALS_SRC)/miXed/test/pddp/*.* \ - $(APPLICATIONS_DEST)/$(PDDP_NAME) + cd $(externals_src)/miXed/pddp && $(MAKE) OUT_DIR=$(PDDP_OUT_DIR) +# install -d $(helpdir)/$(PDDP_NAME) +# install -d $(manualsdir)/$(PDDP_NAME) + install -d $(examplesdir)/$(PDDP_NAME) + install -p $(externals_src)/miXed/test/pddp/*.* \ + $(examplesdir)/$(PDDP_NAME) @@ -292,25 +292,25 @@ pddp_install: pddp # PDP PDP_NAME=pdp pdp: -# cd $(EXTERNALS_SRC)/pdp && ./configure && $(MAKE) +# cd $(externals_src)/pdp && ./configure && $(MAKE) #TODO: compile pidip here #TODO: compile gem2pdp here pdp_install: pdp -# install -d $(OBJECTS_DEST)/$(PDP_NAME) -# install -p $(EXTERNALS_SRC)/pdp/*.$(EXTENSION) $(OBJECTS_DEST) -# install -p $(EXTERNALS_SRC)/pidip/*.$(EXTENSION) $(OBJECTS_DEST) -# install -p $(EXTERNALS_SRC)/gem2pdp/*.$(EXTENSION) $(OBJECTS_DEST) - install -p $(EXTERNALS_SRC)/pdp/abstractions/*.pd $(OBJECTS_DEST) -# install -d $(HELP_DEST)/$(PDP_NAME) - install -p $(EXTERNALS_SRC)/pdp/doc/objects/*.* $(HELP_DEST) - install -d $(MANUALS_DEST)/$(PDP_NAME) - install -p $(EXTERNALS_SRC)/pdp/doc/reference.txt $(MANUALS_DEST)/$(PDP_NAME) - install -p $(EXTERNALS_SRC)/pdp/doc/introduction/*.* \ - $(MANUALS_DEST)/$(PDP_NAME) - install -d $(APPLICATIONS_DEST)/$(PDP_NAME) - install -p $(EXTERNALS_SRC)/pdp/doc/examples/*.* \ - $(APPLICATIONS_DEST)/$(PDP_NAME) +# install -d $(objectsdir)/$(PDP_NAME) +# install -p $(externals_src)/pdp/*.$(EXTENSION) $(objectsdir) +# install -p $(externals_src)/pidip/*.$(EXTENSION) $(objectsdir) +# install -p $(externals_src)/gem2pdp/*.$(EXTENSION) $(objectsdir) + install -p $(externals_src)/pdp/abstractions/*.pd $(objectsdir) +# install -d $(helpdir)/$(PDP_NAME) + install -p $(externals_src)/pdp/doc/objects/*.* $(helpdir) + install -d $(manualsdir)/$(PDP_NAME) + install -p $(externals_src)/pdp/doc/reference.txt $(manualsdir)/$(PDP_NAME) + install -p $(externals_src)/pdp/doc/introduction/*.* \ + $(manualsdir)/$(PDP_NAME) + install -d $(examplesdir)/$(PDP_NAME) + install -p $(externals_src)/pdp/doc/examples/*.* \ + $(examplesdir)/$(PDP_NAME) @@ -321,17 +321,17 @@ pmpd: pmpd_install: pmpd -# install -d $(OBJECTS_DEST)/$(PMPD_NAME) - install -d $(HELP_DEST)/$(PMPD_NAME) - install -p $(EXTERNALS_SRC)/pmpd/help/*.pd \ - $(HELP_DEST)/$(PMPD_NAME) - install -d $(MANUALS_DEST)/$(PMPD_NAME) - install -d $(MANUALS_DEST)/$(PMPD_NAME) - install -p $(EXTERNALS_SRC)/pmpd/doc/pmpd.pdf/pmpd.pdf \ - $(MANUALS_DEST)/$(PMPD_NAME) - install -d $(APPLICATIONS_DEST)/$(PMPD_NAME) - install -p $(EXTERNALS_SRC)/pmpd/exemples/*.pd \ - $(APPLICATIONS_DEST)/$(PMPD_NAME) +# install -d $(objectsdir)/$(PMPD_NAME) + install -d $(helpdir)/$(PMPD_NAME) + install -p $(externals_src)/pmpd/help/*.pd \ + $(helpdir)/$(PMPD_NAME) + install -d $(manualsdir)/$(PMPD_NAME) + install -d $(manualsdir)/$(PMPD_NAME) + install -p $(externals_src)/pmpd/doc/pmpd.pdf/pmpd.pdf \ + $(manualsdir)/$(PMPD_NAME) + install -d $(examplesdir)/$(PMPD_NAME) + install -p $(externals_src)/pmpd/exemples/*.pd \ + $(examplesdir)/$(PMPD_NAME) @@ -339,24 +339,25 @@ pmpd_install: pmpd # TOXY TOXY_NAME=toxy # toxy is compiled straight into $(OUT_DIR) -TOXY_OUT_DIR=$(OBJECTS_DEST)/$(TOXY_NAME) +TOXY_OUT_DIR=$(objectsdir)/$(TOXY_NAME) toxy: toxy_install: toxy - install -d $(OBJECTS_DEST)/$(TOXY_NAME) - $(SCRIPTS_SRC)/generate-libdir-metafile.sh $(OBJECTS_DEST) $(TOXY_NAME) \ + install -d $(objectsdir)/$(TOXY_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(TOXY_NAME) \ --author "Kzrysztof Czaja" \ --license "BSD" \ --description "objects for working with Tcl and Pd's Tk GUI" - cd $(EXTERNALS_SRC)/miXed/toxy && $(MAKE) OUT_DIR=$(TOXY_OUT_DIR) - install -d $(HELP_DEST)/$(TOXY_NAME) - install -p $(EXTERNALS_SRC)/miXed/doc/help/toxy/*.* \ - $(HELP_DEST)/$(TOXY_NAME) -# install -d $(MANUALS_DEST)/$(TOXY_NAME) - install -d $(APPLICATIONS_DEST)/$(TOXY_NAME) - install -p $(EXTERNALS_SRC)/miXed/test/toxy/*.* \ - $(APPLICATIONS_DEST)/$(TOXY_NAME) +# [tow] is currently broken, it doesn't compile + -cd $(externals_src)/miXed/toxy && $(MAKE) OUT_DIR=$(TOXY_OUT_DIR) + install -d $(helpdir)/$(TOXY_NAME) + install -p $(externals_src)/miXed/doc/help/toxy/*.* \ + $(helpdir)/$(TOXY_NAME) +# install -d $(manualsdir)/$(TOXY_NAME) + install -d $(examplesdir)/$(TOXY_NAME) + install -p $(externals_src)/miXed/test/toxy/*.* \ + $(examplesdir)/$(TOXY_NAME) @@ -367,12 +368,12 @@ vbap: vbap_install: vbap - install -d $(OBJECTS_DEST)/$(VBAP_NAME) -# install -d $(HELP_DEST)/$(VBAP_NAME) -# install -d $(MANUALS_DEST)/$(VBAP_NAME) -# install -d $(APPLICATIONS_DEST)/$(VBAP_NAME) - install -p $(EXTERNALS_SRC)/vbap/graph-to-aziele.pd \ - $(OBJECTS_DEST)/$(VBAP_NAME) + install -d $(objectsdir)/$(VBAP_NAME) +# install -d $(helpdir)/$(VBAP_NAME) +# install -d $(manualsdir)/$(VBAP_NAME) +# install -d $(examplesdir)/$(VBAP_NAME) + install -p $(externals_src)/vbap/graph-to-aziele.pd \ + $(objectsdir)/$(VBAP_NAME) @@ -383,19 +384,19 @@ zexy: # zexy's new build system doesn't work with CVS layout, and most of zexy is # included in the extrnals build system now anyway. But the abstractions # should still be included -# cd $(EXTERNALS_SRC)/zexy/src && autoconf && ./configure && $(MAKE) +# cd $(externals_src)/zexy/src && autoconf && ./configure && $(MAKE) zexy_install: zexy - install -d $(OBJECTS_DEST)/$(ZEXY_NAME) -# install -p $(EXTERNALS_SRC)/zexy/src/*.$(EXTENSION) $(OBJECTS_DEST)/$(ZEXY_NAME) - install -p $(shell ls -1 $(EXTERNALS_SRC)/zexy/abs/*.pd | \ + install -d $(objectsdir)/$(ZEXY_NAME) +# install -p $(externals_src)/zexy/src/*.$(EXTENSION) $(objectsdir)/$(ZEXY_NAME) + install -p $(shell ls -1 $(externals_src)/zexy/abs/*.pd | \ grep -v '-help.pd' | sed 's/\([&<>|~]\)/\\\1/g') \ - $(OBJECTS_DEST)/$(ZEXY_NAME) - install -d $(HELP_DEST)/$(ZEXY_NAME) - install -p $(EXTERNALS_SRC)/zexy/abs/*-help.pd $(HELP_DEST)/$(ZEXY_NAME) - install -p $(EXTERNALS_SRC)/zexy/zexy.pd $(HELP_DEST) - install -p $(EXTERNALS_SRC)/zexy/examples/*.* $(HELP_DEST)/$(ZEXY_NAME) + $(objectsdir)/$(ZEXY_NAME) + install -d $(helpdir)/$(ZEXY_NAME) + install -p $(externals_src)/zexy/abs/*-help.pd $(helpdir)/$(ZEXY_NAME) + install -p $(externals_src)/zexy/zexy.pd $(helpdir) + install -p $(externals_src)/zexy/examples/*.* $(helpdir)/$(ZEXY_NAME) @@ -409,36 +410,36 @@ zexy_install: zexy unfiltered_install: #---------------------------------------------------------------------------- # hcs - install -p $(shell ls -1 $(EXTERNALS_SRC)/hcs/*.pd | \ - grep -v '\-help.pd') $(OBJECTS_DEST) + install -p $(shell ls -1 $(externals_src)/hcs/*.pd | \ + grep -v '\-help.pd') $(objectsdir) # hid # these don't work on Windows yet - cd $(EXTERNALS_SRC)/hcs/hid && $(MAKE) - install -p $(EXTERNALS_SRC)/hcs/hid/hid.$(EXTENSION) $(OBJECTS_DEST) - install -p $(shell ls -1 $(EXTERNALS_SRC)/hcs/hid/*.pd | \ - grep -v '\-help.pd'| grep -v '\-list.pd') $(OBJECTS_DEST) + cd $(externals_src)/hcs/hid && $(MAKE) + install -p $(externals_src)/hcs/hid/hid.$(EXTENSION) $(objectsdir) + install -p $(shell ls -1 $(externals_src)/hcs/hid/*.pd | \ + grep -v '\-help.pd'| grep -v '\-list.pd') $(objectsdir) # general - install -p $(EXTERNALS_SRC)/hcs/general/*.pd $(OBJECTS_DEST) + install -p $(externals_src)/hcs/general/*.pd $(objectsdir) # pan - install -p $(shell ls -1 $(EXTERNALS_SRC)/hcs/pan/*.pd | \ - grep -v '\-help.pd') $(OBJECTS_DEST) + install -p $(shell ls -1 $(externals_src)/hcs/pan/*.pd | \ + grep -v '\-help.pd') $(objectsdir) #---------------------------------------------------------------------------- # OSC - test -e cd $(EXTERNALS_SRC)/OSCx/Makefile || \ - (cd $(EXTERNALS_SRC)/OSCx && ./configure) + test -e $(externals_src)/OSCx/Makefile || \ + (cd $(externals_src)/OSCx && ./configure) # these don't work on Windows yet - cd $(EXTERNALS_SRC)/OSCx && $(MAKE) CC=gcc - install -p $(EXTERNALS_SRC)/OSCx/doc/*.* $(HELP_DEST) - install -p $(EXTERNALS_SRC)/OSCx/src/*.$(EXTENSION) $(OBJECTS_DEST) + cd $(externals_src)/OSCx && $(MAKE) CC=gcc + install -p $(externals_src)/OSCx/doc/*.* $(helpdir) + install -p $(externals_src)/OSCx/src/*.$(EXTENSION) $(objectsdir) #---------------------------------------------------------------------------- # unauthorized # these don't work on Windows yet - cd $(EXTERNALS_SRC)/unauthorized && $(MAKE) - install -p $(EXTERNALS_SRC)/unauthorized/*/*.$(EXTENSION) $(OBJECTS_DEST) - install -p $(EXTERNALS_SRC)/unauthorized/*/*.pd $(HELP_DEST) - install -p $(EXTERNALS_SRC)/unauthorized/*/*.txt $(HELP_DEST) - install -p $(EXTERNALS_SRC)/unauthorized/*/*.pls $(HELP_DEST) - cp -Rfp $(EXTERNALS_SRC)/unauthorized/blinkenlights/blm $(HELP_DEST) + cd $(externals_src)/unauthorized && $(MAKE) + install -p $(externals_src)/unauthorized/*/*.$(EXTENSION) $(objectsdir) + install -p $(externals_src)/unauthorized/*/*.pd $(helpdir) + install -p $(externals_src)/unauthorized/*/*.txt $(helpdir) + install -p $(externals_src)/unauthorized/*/*.pls $(helpdir) + cp -Rfp $(externals_src)/unauthorized/blinkenlights/blm $(helpdir) #==============================================================================# @@ -459,13 +460,13 @@ devsymlinks: # the destination-specific clean targets are in Makefile.buildlayout clean: install_clean - cd $(EXTERNALS_SRC)/build/$(OS_NAME) && make $(DEST_PATHS) clean - cd $(EXTERNALS_SRC)/hcs/hid && make $(DEST_PATHS) clean - cd $(EXTERNALS_SRC)/OSCx && make $(DEST_PATHS) clean - cd $(EXTERNALS_SRC)/mixed/cyclone && make $(DEST_PATHS) clean - cd $(EXTERNALS_SRC)/mixed/pddp && make $(DEST_PATHS) clean - cd $(EXTERNALS_SRC)/mixed/toxy && make $(DEST_PATHS) clean - cd $(EXTERNALS_SRC)/unauthorized && make $(DEST_PATHS) clean + cd $(externals_src)/build/$(OS_NAME) && make $(DEST_PATHS) clean + cd $(externals_src)/hcs/hid && make $(DEST_PATHS) clean + cd $(externals_src)/OSCx && make $(DEST_PATHS) clean + cd $(externals_src)/mixed/cyclone && make $(DEST_PATHS) clean + cd $(externals_src)/mixed/pddp && make $(DEST_PATHS) clean + cd $(externals_src)/mixed/toxy && make $(DEST_PATHS) clean + cd $(externals_src)/unauthorized && make $(DEST_PATHS) clean distclean: clean cruft_clean - rm $(EXTERNALS_SRC)/OSCx Makefile + rm $(externals_src)/OSCx Makefile diff --git a/externals/Makefile.buildlayout b/externals/Makefile.buildlayout index 12df9df5..4e386afc 100644 --- a/externals/Makefile.buildlayout +++ b/externals/Makefile.buildlayout @@ -9,12 +9,12 @@ # This file should be exactly the same in each section of the CVS. A copy is # 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). +# Makefile.buildlayout") and then define $(prefix) and $(cvs_root_dir). # -# $(SRC_ROOT_DIR) is the base directory of src tree, equivalent to the root +# $(cvs_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 +# $(prefix) is the base directory to where all of the resulting files # will be copied. # # This file is currently located in these places: @@ -63,27 +63,27 @@ endif #==============================================================================# # 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 +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 -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 +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 #==============================================================================# @@ -93,23 +93,23 @@ MANUALS_DEST = $(DOCS_DEST)/manuals #==============================================================================# # first make sure that the directory structure is setup -$(INSTALL_PREFIX): - install -d $(INSTALL_PREFIX) +$(prefix): + install -d $(prefix) -$(APPLICATIONS_DEST): $(INSTALL_PREFIX) - install -d $(APPLICATIONS_DEST) +$(examplesdir): $(prefix) + install -d $(examplesdir) -$(DOCS_DEST): $(INSTALL_PREFIX) - install -d $(DOCS_DEST) +$(pddocdir): $(prefix) + install -d $(pddocdir) -$(HELP_DEST): $(INSTALL_PREFIX) - install -d $(HELP_DEST) +$(helpdir): $(prefix) + install -d $(helpdir) -$(MANUALS_DEST): $(INSTALL_PREFIX) - install -d $(MANUALS_DEST) +$(manualsdir): $(prefix) + install -d $(manualsdir) -$(OBJECTS_DEST): $(INSTALL_PREFIX) - install -d $(OBJECTS_DEST) +$(objectsdir): $(prefix) + install -d $(objectsdir) #==============================================================================# @@ -119,11 +119,11 @@ $(OBJECTS_DEST): $(INSTALL_PREFIX) #==============================================================================# -PD_MAJOR_VERSION := $(shell grep 'Pd version' $(PD_SRC)/src/s_main.c | \ +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 | \ +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 | \ +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 PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) @@ -142,51 +142,51 @@ PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION) #==============================================================================# 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) + -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 -- $(HELP_DEST)/*/*/*.* - -rm -f -- $(HELP_DEST)/*/*.* - -rm -f -- $(HELP_DEST)/*.* - -rmdir $(HELP_DEST)/*/* - -rmdir $(HELP_DEST)/* - -rmdir $(HELP_DEST) + -rm -f -- $(helpdir)/*/*/*.* + -rm -f -- $(helpdir)/*/*.* + -rm -f -- $(helpdir)/*.* + -rmdir $(helpdir)/*/* + -rmdir $(helpdir)/* + -rmdir $(helpdir) manuals_clean: - -rm -f -- $(MANUALS_DEST)/*/*/*.* - -rm -f -- $(MANUALS_DEST)/*/*.* - -rmdir $(MANUALS_DEST)/*/* - -rmdir $(MANUALS_DEST)/* - -rmdir $(MANUALS_DEST) + -rm -f -- $(manualsdir)/*/*/*.* + -rm -f -- $(manualsdir)/*/*.* + -rmdir $(manualsdir)/*/* + -rmdir $(manualsdir)/* + -rmdir $(manualsdir) 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) + -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 $(DOCS_DEST) - -rmdir $(INSTALL_PREFIX) + -rmdir $(pddocdir) + -rmdir $(prefix) @echo " " - @echo "Build destination cleaned: $(INSTALL_PREFIX)" + @echo "Build destination cleaned: $(prefix)" cruft_clean: diff --git a/externals/build/darwin/makefile b/externals/build/darwin/makefile index bb32bfba..6fce2309 100644 --- a/externals/build/darwin/makefile +++ b/externals/build/darwin/makefile @@ -2,8 +2,8 @@ CWD := $(shell pwd) # these are setup to be overridden by the packages/Makefile -SRC_ROOT_DIR = $(CWD)/../../.. -INSTALL_PREFIX = build +cvs_root_dir = $(CWD)/../../.. +prefix = build BUILDLAYOUT_DIR = $(CWD)/../.. all: externals @@ -12,12 +12,12 @@ all: externals include $(BUILDLAYOUT_DIR)/Makefile.buildlayout -BUILD_SRC = $(EXTERNALS_SRC)/build/src -BUILD_DARWIN_SRC = $(EXTERNALS_SRC)/build/darwin +BUILD_SRC = $(externals_src)/build/src +BUILD_DARWIN_SRC = $(externals_src)/build/darwin EXTERNALS = $(shell ls -1 $(BUILD_SRC) | grep -e '.*\.c$$') -PDEXECUTABLE = $(PD_SRC)/bin/pd +PDEXECUTABLE = $(pd_src)/bin/pd ## These generally need gcc-3.3 # Generic PowerPC @@ -33,7 +33,7 @@ OPTIM_FLAGS = -mpowerpc-gpopt -mcpu=750 CFLAGS = -DPD -DUNIX -DMACOSX -Dunix $(OPTIM_FLAGS) \ -Wall -W -Wno-unused -Wno-parentheses -Wno-switch -Wno-shadow -INCLUDES = -I$(PD_SRC)/src -I/sw/include +INCLUDES = -I$(pd_src)/src -I/sw/include LDFLAGS = -bundle -bundle_loader $(PDEXECUTABLE) -L/sw/lib externals: $(EXTERNALS:.c=.pd_darwin) diff --git a/packages/Makefile b/packages/Makefile index ca503f54..50b294b0 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -9,8 +9,8 @@ CWD := $(shell pwd) -SRC_ROOT_DIR = $(CWD)/.. -INSTALL_PREFIX = $(SRC_ROOT_DIR)/packages/build +cvs_root_dir = $(CWD)/.. +prefix = $(cvs_root_dir)/packages/build BUILDLAYOUT_DIR = $(CWD) @@ -29,59 +29,59 @@ include $(BUILDLAYOUT_DIR)/Makefile.buildlayout CYCLONE_MAJOR_VERSION := $(shell grep CYCLONE_VERSION \ - $(EXTERNALS_SRC)/miXed/cyclone/build_counter | cut -d ' ' -f 3 | \ + $(externals_src)/miXed/cyclone/build_counter | cut -d ' ' -f 3 | \ cut -d '"' -f 2) CYCLONE_RELEASE := $(shell grep CYCLONE_RELEASE \ - $(EXTERNALS_SRC)/miXed/cyclone/build_counter | cut -d ' ' -f 3 | \ + $(externals_src)/miXed/cyclone/build_counter | cut -d ' ' -f 3 | \ cut -d '"' -f 2) CYCLONE_BUILD := $(shell grep CYCLONE_BUILD \ - $(EXTERNALS_SRC)/miXed/cyclone/build_counter | cut -d ' ' -f 3 | \ + $(externals_src)/miXed/cyclone/build_counter | cut -d ' ' -f 3 | \ cut -d '"' -f 2) CYCLONE_VERSION := $(CYCLONE_MAJOR_VERSION) $(CYCLONE_RELEASE) $(CYCLONE_BUILD) FLEXT_MAJOR_VERSION := $(shell grep FLEXTMAJOR \ - $(EXTERNALS_SRC)/grill/flext/buildsys/version.inc | cut -d '=' -f2) + $(externals_src)/grill/flext/buildsys/version.inc | cut -d '=' -f2) FLEXT_MINOR_VERSION := $(shell grep FLEXTMINOR \ - $(EXTERNALS_SRC)/grill/flext/buildsys/version.inc | cut -d '=' -f2) + $(externals_src)/grill/flext/buildsys/version.inc | cut -d '=' -f2) FLEXT_MICRO_VERSION := $(shell grep FLEXTMICRO \ - $(EXTERNALS_SRC)/grill/flext/buildsys/version.inc | cut -d '=' -f2) + $(externals_src)/grill/flext/buildsys/version.inc | cut -d '=' -f2) FLEXT_VERSION := $(FLEXT_MAJOR_VERSION).$(FLEXT_MINOR_VERSION).$(FLEXT_MICRO_VERSION) -GEM_VERSION := $(shell grep "GEM_VERSION" $(GEM_SRC)/src/Base/GemVersion.h | \ +GEM_VERSION := $(shell grep "GEM_VERSION" $(gem_src)/src/Base/GemVersion.h | \ cut -d '"' -f 2) MAXLIB_VERSION := $(shell grep "define VERSION" \ - $(EXTERNALS_SRC)/maxlib/maxlib.c | cut -d '"' -f 2) + $(externals_src)/maxlib/maxlib.c | cut -d '"' -f 2) -OSC_VERSION := $(shell grep "define VERSION" $(EXTERNALS_SRC)/OSCx/src/OSC.c | \ +OSC_VERSION := $(shell grep "define VERSION" $(externals_src)/OSCx/src/OSC.c | \ cut -d '"' -f 2) -PDP_VERSION := $(shell grep PDP_VERSION= $(EXTERNALS_SRC)/pdp/configure | \ +PDP_VERSION := $(shell grep PDP_VERSION= $(externals_src)/pdp/configure | \ cut -d '=' -f 2) PMPD_VERSION := $(shell grep "define VERSION" \ - $(EXTERNALS_SRC)/pmpd/src/pmpd.c | cut -d '"' -f 2) + $(externals_src)/pmpd/src/pmpd.c | cut -d '"' -f 2) TOXY_MAJOR_VERSION := $(shell grep TOXY_VERSION \ - $(EXTERNALS_SRC)/miXed/toxy/build_counter | cut -d ' ' -f 3 | \ + $(externals_src)/miXed/toxy/build_counter | cut -d ' ' -f 3 | \ cut -d '"' -f 2) TOXY_RELEASE := $(shell grep TOXY_RELEASE \ - $(EXTERNALS_SRC)/miXed/toxy/build_counter | cut -d ' ' -f 3 | \ + $(externals_src)/miXed/toxy/build_counter | cut -d ' ' -f 3 | \ cut -d '"' -f 2) TOXY_BUILD := $(shell grep TOXY_BUILD \ - $(EXTERNALS_SRC)/miXed/toxy/build_counter | cut -d ' ' -f 3 | \ + $(externals_src)/miXed/toxy/build_counter | cut -d ' ' -f 3 | \ cut -d '"' -f 2) TOXY_VERSION := $(TOXY_MAJOR_VERSION) $(TOXY_RELEASE) $(TOXY_BUILD) -ZEXY_VERSION := $(shell grep VERSION $(EXTERNALS_SRC)/zexy/src/zexy.h | \ +ZEXY_VERSION := $(shell grep VERSION $(externals_src)/zexy/src/zexy.h | \ grep -v _VERSION | cut -d ' ' -f 3 | cut -d '"' -f 2) @@ -89,8 +89,8 @@ ZEXY_VERSION := $(shell grep VERSION $(EXTERNALS_SRC)/zexy/src/zexy.h | \ # these are sent to all of the various Makefiles so that they all copy their # output to the same directory tree DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \ - SRC_ROOT_DIR=$(SRC_ROOT_DIR) \ - INSTALL_PREFIX=$(INSTALL_PREFIX) \ + cvs_root_dir=$(cvs_root_dir) \ + prefix=$(prefix) \ UNAME=$(UNAME) @@ -113,24 +113,24 @@ doc: #------------------------------------------------------------------------------ # externals externals: - cd $(EXTERNALS_SRC) && make $(DEST_PATHS) + cd $(externals_src) && make $(DEST_PATHS) #------------------------------------------------------------------------------ # flext flext: # nusmuk - cd $(EXTERNALS_SRC)/nusmuk/msd && $(EXTERNALS_SRC)/grill/flext/build.sh \ + cd $(externals_src)/nusmuk/msd && $(externals_src)/grill/flext/build.sh \ pd gcc - cd $(EXTERNALS_SRC)/nusmuk/msd2D && $(EXTERNALS_SRC)/grill/flext/build.sh \ + cd $(externals_src)/nusmuk/msd2D && $(externals_src)/grill/flext/build.sh \ pd gcc - cd $(EXTERNALS_SRC)/nusmuk/msd3D && $(EXTERNALS_SRC)/grill/flext/build.sh \ + cd $(externals_src)/nusmuk/msd3D && $(externals_src)/grill/flext/build.sh \ pd gcc #------------------------------------------------------------------------------ # Gem gem: -# cd $(GEM_SRC)/Gem && xcodebuild +# cd $(gem_src)/Gem && xcodebuild #------------------------------------------------------------------------------ @@ -139,21 +139,21 @@ gem: # this relies on patches/build_vars_4_makefile.in.patch DESTDIR = "" ifeq ($(OS_NAME),darwin) - LIBPD_DEST = $(INSTALL_PREFIX) - LIBBIN_DEST = $(BIN_DEST) + libpddir = $(prefix) + libpdbindir = $(bindir) else ifeq ($(OS_NAME),win) - LIBPD_DEST = $(INSTALL_PREFIX) - LIBBIN_DEST = $(BIN_DEST) + libpddir = $(prefix) + libpdbindir = $(bindir) else - LIBPD_DEST = $(INSTDIR)/lib/pd - LIBBIN_DEST = $(LIB_DEST)/pd/bin + libpddir = $(INSTDIR)/lib/pd + libpdbindir = $(libpddir)/bin endif endif PD_DEST_PATHS = $(DEST_PATHS) DESTDIR=$(DESTDIR) \ - LIBPD_DEST=$(LIBPD_DEST) \ - LIBBIN_DEST=$(LIBBIN_DEST) + libpddir=$(libpddir) \ + libpdbindir=$(libpdbindir) PD_CONFIGURE_FLAGS = PD_EXTRA_FLAGS = @@ -165,12 +165,12 @@ PD_AUTOCONF = autoconf pd: - echo "DESTDIR $(DESTDIR) LIBBIN_DEST $(LIBBIN_DEST)" + echo "DESTDIR $(DESTDIR) libpdbindir $(libpdbindir)" echo "DEST_PATHS $(DEST_PATHS)" echo "PD_DEST_PATHS $(PD_DEST_PATHS)" echo "PD_EXTRA_FLAGS $(PD_EXTRA_FLAGS)" - cd $(PD_SRC)/src/ && $(PD_AUTOCONF) - cd $(PD_SRC)/src && ./configure $(PD_CONFIGURE_FLAGS) && \ + cd $(pd_src)/src/ && $(PD_AUTOCONF) + cd $(pd_src)/src && ./configure $(PD_CONFIGURE_FLAGS) && \ make $(PD_DEST_PATHS) $(PD_EXTRA_FLAGS) @@ -190,29 +190,29 @@ install: noncvs_install #------------------------------------------------------------------------------ # abstractions_install abstractions_install: - cd $(ABSTRACTIONS_SRC) && make $(DEST_PATHS) install + cd $(abstractions_src) && make $(DEST_PATHS) install #------------------------------------------------------------------------------ # doc_install doc_install: - cd $(DOC_SRC) && make $(DEST_PATHS) install + cd $(doc_src) && make $(DEST_PATHS) install #------------------------------------------------------------------------------ # externals_install externals_install: - cd $(EXTERNALS_SRC) && make $(DEST_PATHS) install + cd $(externals_src) && make $(DEST_PATHS) install #------------------------------------------------------------------------------ # flext_install flext_install: # nusmuk - cd $(EXTERNALS_SRC)/nusmuk/msd && $(EXTERNALS_SRC)/grill/flext/build.sh \ + cd $(externals_src)/nusmuk/msd && $(externals_src)/grill/flext/build.sh \ pd gcc install - cd $(EXTERNALS_SRC)/nusmuk/msd2D && $(EXTERNALS_SRC)/grill/flext/build.sh \ + cd $(externals_src)/nusmuk/msd2D && $(externals_src)/grill/flext/build.sh \ pd gcc install - cd $(EXTERNALS_SRC)/nusmuk/msd3D && $(EXTERNALS_SRC)/grill/flext/build.sh \ + cd $(externals_src)/nusmuk/msd3D && $(externals_src)/grill/flext/build.sh \ pd gcc install #TODO: need to add nusmuk/editor @@ -220,20 +220,20 @@ flext_install: #------------------------------------------------------------------------------ # gem_install GEM_NAME = gem -gem_install: gem $(HELP_DEST) - install -p $(GEM_SRC)/help/*.* $(HELP_DEST) - install -p $(GEM_SRC)/abstractions/*-help.pd $(HELP_DEST) - install -d $(OBJECTS_DEST)/$(GEM_NAME) - install -p $(shell ls -1 $(GEM_SRC)/abstractions/*.* | \ - grep -v '\-help.pd') $(OBJECTS_DEST) - install -d $(MANUALS_DEST)/$(GEM_NAME) - install -p $(GEM_SRC)/doc/*.* $(MANUALS_DEST)/$(GEM_NAME) - install -d $(MANUALS_DEST)/$(GEM_NAME)/manual - install -p $(GEM_SRC)/manual/*.* $(MANUALS_DEST)/$(GEM_NAME)/manual - for dir in $(shell ls -1 $(GEM_SRC)/examples | grep -v CVS); do \ +gem_install: gem $(helpdir) + install -p $(gem_src)/help/*.* $(helpdir) + install -p $(gem_src)/abstractions/*-help.pd $(helpdir) + install -d $(objectsdir)/$(GEM_NAME) + install -p $(shell ls -1 $(gem_src)/abstractions/*.* | \ + grep -v '\-help.pd') $(objectsdir) + install -d $(manualsdir)/$(GEM_NAME) + install -p $(gem_src)/doc/*.* $(manualsdir)/$(GEM_NAME) + install -d $(manualsdir)/$(GEM_NAME)/manual + install -p $(gem_src)/manual/*.* $(manualsdir)/$(GEM_NAME)/manual + for dir in $(shell ls -1 $(gem_src)/examples | grep -v CVS); do \ echo "installing $$dir"; \ - install -d $(APPLICATIONS_DEST)/$(GEM_NAME)/$$dir ; \ - install -p $(GEM_SRC)/examples/$$dir/*.* $(APPLICATIONS_DEST)/$(GEM_NAME)/$$dir ; \ + install -d $(examplesdir)/$(GEM_NAME)/$$dir ; \ + install -p $(gem_src)/examples/$$dir/*.* $(examplesdir)/$(GEM_NAME)/$$dir ; \ done @@ -241,10 +241,10 @@ gem_install: gem $(HELP_DEST) # noncvs_install # this is for including pre-compiled binaries in a build noncvs_install: - -install -p $(PACKAGES_SRC)/noncvs/$(OS_NAME)/bin/*.* $(BIN_DEST) - -install -p $(PACKAGES_SRC)/noncvs/$(OS_NAME)/doc/5.reference/*.* \ - $(HELP_DEST) - -install -p $(PACKAGES_SRC)/noncvs/$(OS_NAME)/extra/*.* $(OBJECTS_DEST) + -install -p $(packages_src)/noncvs/$(OS_NAME)/bin/*.* $(bindir) + -install -p $(packages_src)/noncvs/$(OS_NAME)/doc/5.reference/*.* \ + $(helpdir) + -install -p $(packages_src)/noncvs/$(OS_NAME)/extra/*.* $(objectsdir) @@ -252,10 +252,10 @@ noncvs_install: # pd_install PD_NAME=Pd pd_install: pd - cd $(PD_SRC)/src && \ + cd $(pd_src)/src && \ make $(PD_DEST_PATHS) $(PD_EXTRA_FLAGS) install - install -d $(MANUALS_DEST)/$(PD_NAME) - install -p $(PD_SRC)/src/notes.txt $(MANUALS_DEST)/$(PD_NAME) + install -d $(manualsdir)/$(PD_NAME) + install -p $(pd_src)/src/notes.txt $(manualsdir)/$(PD_NAME) @@ -265,37 +265,40 @@ pd_install: pd # #==============================================================================# -LICENSE_FILE = $(MANUALS_DEST)/$(PD_NAME)/License.html +LICENSE_FILE = $(manualsdir)/$(PD_NAME)/License.html license_install: # generate HTML version of License + install -d $(manualsdir)/$(PD_NAME) touch $(LICENSE_FILE) echo "" >> "$(LICENSE_FILE)" echo "

(Parts of this package can be used under " >> "$(LICENSE_FILE)" echo "Pd"s BSD license)

" >> "$(LICENSE_FILE)" echo "" >> "$(LICENSE_FILE)" - cat "$(EXTERNALS_SRC)/creb/COPYING" | sed -e 's/^$$/\/g' >> "$(LICENSE_FILE)" + cat "$(externals_src)/creb/COPYING" | sed -e 's/^$$/\/g' >> "$(LICENSE_FILE)" echo "" >> $(LICENSE_FILE) # Pd's license file - install -p "$(PD_SRC)/LICENSE.txt" "$(MANUALS_DEST)/$(PD_NAME)/PD LICENSE.txt" + install -p "$(pd_src)/LICENSE.txt" "$(manualsdir)/$(PD_NAME)/PD LICENSE.txt" -WELCOME_FILE = $(MANUALS_DEST)/$(PD_NAME)/Welcome.html +WELCOME_FILE = $(manualsdir)/$(PD_NAME)/Welcome.html welcome_install: + install -d $(manualsdir)/$(PD_NAME) touch $(WELCOME_FILE) echo "

" >> $(WELCOME_FILE) echo "

" >> $(WELCOME_FILE) echo "

Version $(PD_VERSION)

" >> $(WELCOME_FILE) echo "

written by Miller S. Puckette

" >> $(WELCOME_FILE) echo "" >> $(WELCOME_FILE) - echo "

`grep -A9 ACKNOWLEDG $(PD_SRC)/README.txt`

" >> $(WELCOME_FILE) + echo "

`grep -A9 ACKNOWLEDG $(pd_src)/README.txt`

" >> $(WELCOME_FILE) echo "" >> $(WELCOME_FILE) echo "" >> $(WELCOME_FILE) -README_FILE = $(MANUALS_DEST)/$(PD_NAME)/ReadMe.html +README_FILE = $(manualsdir)/$(PD_NAME)/ReadMe.html readme_install: + install -d $(manualsdir)/$(PD_NAME) echo $(CYCLONE_RELEASE) -rm $(README_FILE) touch $(README_FILE) @@ -361,15 +364,15 @@ readme_install: # DOC_FORMAT doc_format: # clean out cruft files - -find $(INSTALL_PREFIX) -name .DS_Store -delete - -find $(INSTALL_PREFIX) -name '*.*.bak' -delete + -find $(prefix) -name .DS_Store -delete + -find $(prefix) -name '*.*.bak' -delete # run script to move help-*.pd files to *-help.pd according to the standard - cd $(DOCS_DEST) && \ - $(SCRIPTS_SRC)/convert-help-to-standard.sh + cd $(pddocdir) && \ + $(scripts_src)/convert-help-to-standard.sh # remove write perms to prevent people form editing the helpfiles by mistake - cd $(DOCS_DEST) && chmod a-wx */*.pd */*/*.pd - find $(DOCS_DEST) -name '*.pd' -print0 | xargs -0 chmod a-wx - find $(DOCS_DEST) -name '*.txt' -print0 | xargs -0 chmod a-wx + cd $(pddocdir) && chmod a-wx */*.pd */*/*.pd + find $(pddocdir) -name '*.pd' -print0 | xargs -0 chmod a-wx + find $(pddocdir) -name '*.txt' -print0 | xargs -0 chmod a-wx @@ -384,43 +387,43 @@ devsymlinks: patch_pd: - @echo PD_SRC $(PD_SRC) + @echo pd_src $(pd_src) # change Pd's version number to reflect the extended build - cd $(PD_SRC)/src/ && \ + 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 \ echo "Applying $$patch"; \ - cd $(PD_SRC)/src/ && patch -p0 < $$patch; \ + cd $(pd_src)/src/ && patch -p0 < $$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 < $$patch; \ + cd $(pd_src)/src/ && patch -p0 < $$patch; \ done - -rm -f -- $(PD_SRC)/src/configure $(PD_SRC)/src/makefile + -rm -f -- $(pd_src)/src/configure $(pd_src)/src/makefile @echo " " @echo "patching succeeded!" unpatch_pd: # this sed pattern won't work with TEST versions - cd $(PD_SRC)/src && \ + cd $(pd_src)/src && \ sed 's/\(pd_version\[\] = "Pd version [0-9]\.[0-9]*[.-][0-9]*\)[0-9extndRC.-]*/\1/' \ 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; \ + 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; \ + cd $(pd_src)/src/ && patch -p0 -R < $$patch; \ done - -rm -f -- $(PD_SRC)/src/configure $(PD_SRC)/src/makefile + -rm -f -- $(pd_src)/src/configure $(pd_src)/src/makefile @echo " " @echo "unpatching succeeded!" @@ -431,14 +434,14 @@ unpatch_pd: # #==============================================================================# abstractions_clean: - -cd $(ABSTRACTIONS_SRC) && make $(DEST_PATHS) clean + -cd $(abstractions_src) && make $(DEST_PATHS) clean doc_clean: externals_clean: - -cd $(EXTERNALS_SRC) && make $(DEST_PATHS) clean + -cd $(externals_src) && make $(DEST_PATHS) clean flext_clean: @@ -448,7 +451,7 @@ gem_clean: pd_clean: - -cd $(PD_SRC) && make $(PD_DEST_PATHS) clean + -cd $(pd_src) && make $(PD_DEST_PATHS) clean # these targets are all from Makefile.buildlayout: install_clean cruft_clean diff --git a/packages/Makefile.buildlayout b/packages/Makefile.buildlayout index 12df9df5..4e386afc 100644 --- a/packages/Makefile.buildlayout +++ b/packages/Makefile.buildlayout @@ -9,12 +9,12 @@ # This file should be exactly the same in each section of the CVS. A copy is # 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). +# Makefile.buildlayout") and then define $(prefix) and $(cvs_root_dir). # -# $(SRC_ROOT_DIR) is the base directory of src tree, equivalent to the root +# $(cvs_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 +# $(prefix) is the base directory to where all of the resulting files # will be copied. # # This file is currently located in these places: @@ -63,27 +63,27 @@ endif #==============================================================================# # 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 +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 -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 +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 #==============================================================================# @@ -93,23 +93,23 @@ MANUALS_DEST = $(DOCS_DEST)/manuals #==============================================================================# # first make sure that the directory structure is setup -$(INSTALL_PREFIX): - install -d $(INSTALL_PREFIX) +$(prefix): + install -d $(prefix) -$(APPLICATIONS_DEST): $(INSTALL_PREFIX) - install -d $(APPLICATIONS_DEST) +$(examplesdir): $(prefix) + install -d $(examplesdir) -$(DOCS_DEST): $(INSTALL_PREFIX) - install -d $(DOCS_DEST) +$(pddocdir): $(prefix) + install -d $(pddocdir) -$(HELP_DEST): $(INSTALL_PREFIX) - install -d $(HELP_DEST) +$(helpdir): $(prefix) + install -d $(helpdir) -$(MANUALS_DEST): $(INSTALL_PREFIX) - install -d $(MANUALS_DEST) +$(manualsdir): $(prefix) + install -d $(manualsdir) -$(OBJECTS_DEST): $(INSTALL_PREFIX) - install -d $(OBJECTS_DEST) +$(objectsdir): $(prefix) + install -d $(objectsdir) #==============================================================================# @@ -119,11 +119,11 @@ $(OBJECTS_DEST): $(INSTALL_PREFIX) #==============================================================================# -PD_MAJOR_VERSION := $(shell grep 'Pd version' $(PD_SRC)/src/s_main.c | \ +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 | \ +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 | \ +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 PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) @@ -142,51 +142,51 @@ PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION) #==============================================================================# 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) + -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 -- $(HELP_DEST)/*/*/*.* - -rm -f -- $(HELP_DEST)/*/*.* - -rm -f -- $(HELP_DEST)/*.* - -rmdir $(HELP_DEST)/*/* - -rmdir $(HELP_DEST)/* - -rmdir $(HELP_DEST) + -rm -f -- $(helpdir)/*/*/*.* + -rm -f -- $(helpdir)/*/*.* + -rm -f -- $(helpdir)/*.* + -rmdir $(helpdir)/*/* + -rmdir $(helpdir)/* + -rmdir $(helpdir) manuals_clean: - -rm -f -- $(MANUALS_DEST)/*/*/*.* - -rm -f -- $(MANUALS_DEST)/*/*.* - -rmdir $(MANUALS_DEST)/*/* - -rmdir $(MANUALS_DEST)/* - -rmdir $(MANUALS_DEST) + -rm -f -- $(manualsdir)/*/*/*.* + -rm -f -- $(manualsdir)/*/*.* + -rmdir $(manualsdir)/*/* + -rmdir $(manualsdir)/* + -rmdir $(manualsdir) 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) + -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 $(DOCS_DEST) - -rmdir $(INSTALL_PREFIX) + -rmdir $(pddocdir) + -rmdir $(prefix) @echo " " - @echo "Build destination cleaned: $(INSTALL_PREFIX)" + @echo "Build destination cleaned: $(prefix)" cruft_clean: diff --git a/packages/TODO b/packages/TODO index 6544f838..cca144d0 100644 --- a/packages/TODO +++ b/packages/TODO @@ -8,6 +8,14 @@ - downcase *_DEST and *_SRC to be more readable +- change CWD to packages_src where appropriate + +- add DESTDIR to the top of each Makefile + +- test for configure before running autoconf/clean configure on distclean + +- try including packages/Makefile in darwin_app/Makefile to see if I can run pacakges/makefile targets tehn + - On GNU/Linux, figure out how to deal with build/extra vs. build/lib/pd/extra - global optimization flags diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile index 2aa69bf0..8380f634 100644 --- a/packages/darwin_app/Makefile +++ b/packages/darwin_app/Makefile @@ -8,9 +8,9 @@ CWD := $(shell pwd) BUILD_BASE = $(CWD)/build PD_APP_NAME = $(PACKAGE_NAME) PD_APP_CONTENTS = $(BUILD_BASE)/$(PD_APP_NAME).app/Contents -INSTALL_PREFIX = $(PD_APP_CONTENTS)/Resources +prefix = $(PD_APP_CONTENTS)/Resources -SRC_ROOT_DIR = $(CWD)/../.. +cvs_root_dir = $(CWD)/../.. BUILDLAYOUT_DIR = $(CWD)/.. # source for the Wish Shell.app used to build Pd @@ -28,8 +28,8 @@ include $(BUILDLAYOUT_DIR)/Makefile.buildlayout # these are sent to all of the various Makefiles so that they all copy their # output to the same directory tree DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \ - SRC_ROOT_DIR=$(SRC_ROOT_DIR) \ - INSTALL_PREFIX=$(INSTALL_PREFIX) \ + cvs_root_dir=$(cvs_root_dir) \ + prefix=$(prefix) \ UNAME=$(UNAME) install: darwin_app @@ -82,21 +82,21 @@ Info.plist: Info.plist.in # tigital's Gem window focus black magic rez_install: - install -p $(CWD)/mac.r $(BIN_DEST) - cd $(BIN_DEST) && /Developer/tools/Rez -t APPL mac.r -o pd + install -p $(CWD)/mac.r $(bindir) + cd $(bindir) && /Developer/tools/Rez -t APPL mac.r -o pd #------------------------------------------------------------------------------# darwin_app_core: darwin_app_wrapper - cd $(PACKAGES_SRC) && \ + cd $(packages_src) && \ make $(DEST_PATHS) PD_CONFIGURE_FLAGS=--enable-jack pd_install cd "$(PD_APP_CONTENTS)/Resources/Scripts" && \ ln -s ../bin/pd.tk AppMain.tcl # support for Info Panel Plugins mgmt cd "$(PD_APP_CONTENTS)" && ln -s Resources/extra Plugins # run script to move help-*.pd files to *-help.pd according to the standard - cd $(DOCS_DEST) && \ - $(SCRIPTS_SRC)/convert-help-to-standard.sh + cd $(pddocdir) && \ + $(scripts_src)/convert-help-to-standard.sh @@ -104,10 +104,10 @@ darwin_app_doc_format: # set the font to 10pt on all help patches # the BSD/Darwin version of sed must create a backup file when doing # in-place replacement, so delete the unneeded backup files - cd $(DOCS_DEST) && \ + cd $(pddocdir) && \ sed -i.bak 's/^\(\#N canvas [0-9]* [0-9]* [0-9]* [0-9]*\) 12/\1 10/' \ */*.pd */*/*.pd */*/*/*.pd - find $(INSTALL_PREFIX) -name '*.pd.bak' -delete + find $(prefix) -name '*.pd.bak' -delete #==============================================================================# # @@ -116,7 +116,7 @@ darwin_app_doc_format: #==============================================================================# extended_install: - cd $(PACKAGES_SRC) && make $(DEST_PATHS) install + cd $(packages_src) && make $(DEST_PATHS) install #------------------------------------------------------------------------------# @@ -129,12 +129,12 @@ darwin_app_externals_flext: #---------------------------------------------------------------------------- # FLEXT # temp hack -HCS - test -f $(EXTERNALS_SRC)/grill/flext/buildsys/mac/pd/config-gcc.def || \ - cp $(EXTERNALS_SRC)/grill/flext/buildsys/mac/pd/config-gcc.def \ - $(EXTERNALS_SRC)/grill/flext/buildsys/config-mac-pd-gcc.txt + test -f $(externals_src)/grill/flext/buildsys/mac/pd/config-gcc.def || \ + cp $(externals_src)/grill/flext/buildsys/mac/pd/config-gcc.def \ + $(externals_src)/grill/flext/buildsys/config-mac-pd-gcc.txt # end temp hack # tigital 8/30/2005 added - cd $(EXTERNALS_SRC)/grill/flext && \ + cd $(externals_src)/grill/flext && \ ( \ test -f buildsys/config-mac-pd-gcc.txt || \ ( \ @@ -164,88 +164,88 @@ darwin_app_externals_flext: echo Copied template flext config file \ ) \ ) && \ - MACOSX_DEPLOYMENT_TARGET=10.3 bash build.sh pd gcc build-release-shared FLEXTLIB=@executable_path/../extra FLEXTINC=../flext/source FLEXTSYS=$(OBJECTS_DEST) - ln -sf $(EXTERNALS_SRC)/grill/flext/pd-darwin/release-shared/libflext-pd.$(FLEXT_VERSION).dylib $(EXTERNALS_SRC)/grill/flext/pd-darwin/release-shared/libflext-pd.dylib - install -p -m0444 $(EXTERNALS_SRC)/grill/flext/pd-darwin/release-shared/libflext-pd.$(FLEXT_VERSION).dylib $(OBJECTS_DEST) - ln -sf libflext-pd.$(FLEXT_VERSION).dylib $(OBJECTS_DEST)/libflext-pd.dylib - install -d $(DOCS_DEST)/tutorials - cp -rp $(EXTERNALS_SRC)/grill/flext/tutorial $(DOCS_DEST)/tutorials/flext - install -d $(DOCS_DEST)/flext - install -p -m0644 $(EXTERNALS_SRC)/grill/flext/gpl.txt \ - $(EXTERNALS_SRC)/grill/flext/readme.txt \ - $(EXTERNALS_SRC)/grill/flext/license.txt \ - $(DOCS_DEST)/flext + MACOSX_DEPLOYMENT_TARGET=10.3 bash build.sh pd gcc build-release-shared FLEXTLIB=@executable_path/../extra FLEXTINC=../flext/source FLEXTSYS=$(objectsdir) + ln -sf $(externals_src)/grill/flext/pd-darwin/release-shared/libflext-pd.$(FLEXT_VERSION).dylib $(externals_src)/grill/flext/pd-darwin/release-shared/libflext-pd.dylib + install -p -m0444 $(externals_src)/grill/flext/pd-darwin/release-shared/libflext-pd.$(FLEXT_VERSION).dylib $(objectsdir) + ln -sf libflext-pd.$(FLEXT_VERSION).dylib $(objectsdir)/libflext-pd.dylib + install -d $(pddocdir)/tutorials + cp -rp $(externals_src)/grill/flext/tutorial $(pddocdir)/tutorials/flext + install -d $(pddocdir)/flext + install -p -m0644 $(externals_src)/grill/flext/gpl.txt \ + $(externals_src)/grill/flext/readme.txt \ + $(externals_src)/grill/flext/license.txt \ + $(pddocdir)/flext # FLEXTERNALS ######### # dyn~ - cd $(EXTERNALS_SRC)/grill/dynext && bash ../flext/build.sh pd gcc build-release-shared FLEXTLIB=../flext/pd-darwin/release-shared FLEXTINC=../flext/source FLEXTSYS=$(OBJECTS_DEST) - install -p $(EXTERNALS_SRC)/grill/dynext/pd-darwin/release-shared/*.pd_darwin $(OBJECTS_DEST) - install -p $(EXTERNALS_SRC)/grill/dynext/pd/*.pd $(DOCS_DEST) - install -d $(DOCS_DEST)/dynext - install -p $(EXTERNALS_SRC)/grill/dynext/gpl.txt \ - $(EXTERNALS_SRC)/grill/dynext/readme.txt \ - $(EXTERNALS_SRC)/grill/dynext/license.txt \ - $(DOCS_DEST)/dynext + cd $(externals_src)/grill/dynext && bash ../flext/build.sh pd gcc build-release-shared FLEXTLIB=../flext/pd-darwin/release-shared FLEXTINC=../flext/source FLEXTSYS=$(objectsdir) + install -p $(externals_src)/grill/dynext/pd-darwin/release-shared/*.pd_darwin $(objectsdir) + install -p $(externals_src)/grill/dynext/pd/*.pd $(pddocdir) + install -d $(pddocdir)/dynext + install -p $(externals_src)/grill/dynext/gpl.txt \ + $(externals_src)/grill/dynext/readme.txt \ + $(externals_src)/grill/dynext/license.txt \ + $(pddocdir)/dynext ######### # pool - cd $(EXTERNALS_SRC)/grill/pool && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(OBJECTS_DEST) FLEXTINC=../flext/source - install -p $(EXTERNALS_SRC)/grill/pool/pd-darwin/release-shared/*.pd_darwin $(OBJECTS_DEST) - install -p $(EXTERNALS_SRC)/grill/pool/help-pool.pd $(DOCS_DEST) - install -d $(DOCS_DEST)/pool - install -p $(EXTERNALS_SRC)/grill/pool/gpl.txt \ - $(EXTERNALS_SRC)/grill/pool/readme.txt \ - $(EXTERNALS_SRC)/grill/pool/license.txt \ - $(DOCS_DEST)/pool + cd $(externals_src)/grill/pool && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(objectsdir) FLEXTINC=../flext/source + install -p $(externals_src)/grill/pool/pd-darwin/release-shared/*.pd_darwin $(objectsdir) + install -p $(externals_src)/grill/pool/help-pool.pd $(pddocdir) + install -d $(pddocdir)/pool + install -p $(externals_src)/grill/pool/gpl.txt \ + $(externals_src)/grill/pool/readme.txt \ + $(externals_src)/grill/pool/license.txt \ + $(pddocdir)/pool ######### # py/pyext -# cd $(EXTERNALS_SRC)/grill/py && \ +# cd $(externals_src)/grill/py && \ # ( \ # cp -f build/config-mac.def config.txt \ # ) && \ -# bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(OBJECTS_DEST) FLEXTINC=../flext/source -# install -p -m0444 $(EXTERNALS_SRC)/grill/py/pd-darwin/release-shared/*.pd_darwin $(OBJECTS_DEST) +# bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(objectsdir) FLEXTINC=../flext/source +# install -p -m0444 $(externals_src)/grill/py/pd-darwin/release-shared/*.pd_darwin $(objectsdir) # this wasn't building for me -HCS 2005-06-09 - install -d $(DOCS_DEST)/py/examples - install -d $(DOCS_DEST)/py/scripts - install -p $(EXTERNALS_SRC)/grill/py/pd/*.pd $(DOCS_DEST)/py/examples - install -p $(EXTERNALS_SRC)/grill/py/scripts/*.py $(DOCS_DEST)/py/scripts - install -p $(EXTERNALS_SRC)/grill/py/gpl.txt \ - $(EXTERNALS_SRC)/grill/py/readme.txt $(EXTERNALS_SRC)/grill/py/license.txt \ - $(DOCS_DEST)/py -# install -d $(INSTALL_PREFIX)/Library/Frameworks -# cp -R /Library/Frameworks/Python.framework $(INSTALL_PREFIX)/Library/Frameworks + install -d $(pddocdir)/py/examples + install -d $(pddocdir)/py/scripts + install -p $(externals_src)/grill/py/pd/*.pd $(pddocdir)/py/examples + install -p $(externals_src)/grill/py/scripts/*.py $(pddocdir)/py/scripts + install -p $(externals_src)/grill/py/gpl.txt \ + $(externals_src)/grill/py/readme.txt $(externals_src)/grill/py/license.txt \ + $(pddocdir)/py +# install -d $(prefix)/Library/Frameworks +# cp -R /Library/Frameworks/Python.framework $(prefix)/Library/Frameworks ######### # vasp # fails without the dir # test -d ../../vasp/pd-darwin || mkdir -p ../../vasp/pd-darwin -# cd $(EXTERNALS_SRC)/grill/vasp/ && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(OBJECTS_DEST) FLEXTINC=../flext/source -# install -p -m0444 $(EXTERNALS_SRC)/grill/vasp/pd-darwin/release-shared/*.pd_darwin $(OBJECTS_DEST) +# cd $(externals_src)/grill/vasp/ && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(objectsdir) FLEXTINC=../flext/source +# install -p -m0444 $(externals_src)/grill/vasp/pd-darwin/release-shared/*.pd_darwin $(objectsdir) # this wasn't building for me -HCS 2005-06-09 - install -p -m0644 $(EXTERNALS_SRC)/grill/vasp/pd-help/*.pd $(DOCS_DEST) - install -d $(DOCS_DEST)/vasp - install -p -m0644 $(EXTERNALS_SRC)/grill/vasp/gpl.txt \ - $(EXTERNALS_SRC)/grill/vasp/readme.txt \ - $(EXTERNALS_SRC)/grill/vasp/license.txt \ - $(EXTERNALS_SRC)/grill/vasp/changes.txt \ - $(EXTERNALS_SRC)/grill/vasp/todo.txt \ - $(DOCS_DEST)/vasp - cp -rp $(EXTERNALS_SRC)/grill/vasp/pd-ex $(DOCS_DEST)/vasp + install -p -m0644 $(externals_src)/grill/vasp/pd-help/*.pd $(pddocdir) + install -d $(pddocdir)/vasp + install -p -m0644 $(externals_src)/grill/vasp/gpl.txt \ + $(externals_src)/grill/vasp/readme.txt \ + $(externals_src)/grill/vasp/license.txt \ + $(externals_src)/grill/vasp/changes.txt \ + $(externals_src)/grill/vasp/todo.txt \ + $(pddocdir)/vasp + cp -rp $(externals_src)/grill/vasp/pd-ex $(pddocdir)/vasp ######### # xsample - cd $(EXTERNALS_SRC)/grill/xsample && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(OBJECTS_DEST) FLEXTINC=../flext/source - install -p -m0444 $(EXTERNALS_SRC)/grill/xsample/pd-darwin/release-shared/*.pd_darwin $(OBJECTS_DEST) - install -p -m0644 $(EXTERNALS_SRC)/grill/xsample/pd/*.pd $(DOCS_DEST) - install -d $(DOCS_DEST)/xsample - install -p -m0644 $(EXTERNALS_SRC)/grill/xsample/gpl.txt \ - $(EXTERNALS_SRC)/grill/xsample/readme.txt \ - $(EXTERNALS_SRC)/grill/xsample/license.txt \ - $(DOCS_DEST)/xsample + cd $(externals_src)/grill/xsample && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(objectsdir) FLEXTINC=../flext/source + install -p -m0444 $(externals_src)/grill/xsample/pd-darwin/release-shared/*.pd_darwin $(objectsdir) + install -p -m0644 $(externals_src)/grill/xsample/pd/*.pd $(pddocdir) + install -d $(pddocdir)/xsample + install -p -m0644 $(externals_src)/grill/xsample/gpl.txt \ + $(externals_src)/grill/xsample/readme.txt \ + $(externals_src)/grill/xsample/license.txt \ + $(pddocdir)/xsample ########## FOOTILS ######### # syncgrain -# cd $(EXTERNALS_SRC)/footils/syncgrain/ && $(MAKE) -f makefile.pd-darwin -# install -p -m0444 $(EXTERNALS_SRC)/footils/syncgrain/pd-darwin/*.pd_darwin \ -# $(OBJECTS_DEST) - install -p -m0644 $(EXTERNALS_SRC)/footils/syncgrain/pd/*.* $(DOCS_DEST) +# cd $(externals_src)/footils/syncgrain/ && $(MAKE) -f makefile.pd-darwin +# install -p -m0444 $(externals_src)/footils/syncgrain/pd-darwin/*.pd_darwin \ +# $(objectsdir) + install -p -m0644 $(externals_src)/footils/syncgrain/pd/*.* $(pddocdir) @@ -253,29 +253,29 @@ darwin_app_externals_flext: darwin_app_externals_c++: #---------------------------------------------------------------------------- # CREB -# cd $(EXTERNALS_SRC)/creb && autoconf && ./configure && cd modules++ && $(MAKE) -# install -p -m0644 $(EXTERNALS_SRC)/creb/modules++/*.pd_darwin $(OBJECTS_DEST) +# cd $(externals_src)/creb && autoconf && ./configure && cd modules++ && $(MAKE) +# install -p -m0644 $(externals_src)/creb/modules++/*.pd_darwin $(objectsdir) #---------------------------------------------------------------------------- # gem2pdp -# cd $(EXTERNALS_SRC)/gem2pdp && $(MAKE) -f Makefile.darwin -# install -p -m0444 $(EXTERNALS_SRC)/gem2pdp/*.pd_darwin $(OBJECTS_DEST) +# cd $(externals_src)/gem2pdp && $(MAKE) -f Makefile.darwin +# install -p -m0444 $(externals_src)/gem2pdp/*.pd_darwin $(objectsdir) darwin_app_perms: - chmod -R a-w $(DOCS_DEST) + chmod -R a-w $(pddocdir) DMG_NAME = $(PACKAGE_NAME) dmg: darwin_app_perms install -d "$(CWD)/$(DMG_NAME)" cd $(BUILD_BASE) && mv $(PD_APP_NAME).app "$(CWD)/$(DMG_NAME)/" -# install -p -m0444 $(MANUALS_DEST)/$(PD_NAME)/PD\ LICENSE.txt \ -# $(MANUALS_DEST)/*.html "$(CWD)/$(DMG_NAME)" +# install -p -m0444 $(manualsdir)/$(PD_NAME)/PD\ LICENSE.txt \ +# $(manualsdir)/*.html "$(CWD)/$(DMG_NAME)" install -p -m0444 org.puredata.pd.plist "$(CWD)/$(DMG_NAME)" cd $(CWD) && /bin/sh mkdmg "$(DMG_NAME)" clean: darwin_app_clean darwin_app_externals_flext_clean \ - cd $(PACKAGES_SRC) && make clean + cd $(packages_src) && make clean -rm Info.plist @@ -287,11 +287,11 @@ darwin_app_clean: - cd $(GEM_SRC)/Gem && xcodebuild clean + cd $(gem_src)/Gem && xcodebuild clean darwin_app_externals_flext_clean: - cd $(EXTERNALS_SRC)/footils/syncgrain && make -f makefile.pd-darwin clean - -cd $(EXTERNALS_SRC)/grill && \ + cd $(externals_src)/footils/syncgrain && make -f makefile.pd-darwin clean + -cd $(externals_src)/grill && \ rm -- flext/buildsys/config-mac-pd-gcc.txt config.txt flext/config.txt \ flext/source/libflext.a */pd-darwin/*.o */pd-darwin/*/*.o \ */pd-darwin/*/*.pd_darwin */pd-darwin/*.pd_darwin \ @@ -308,38 +308,38 @@ darwin_app_externals_flext_clean: darwin_app_noncvs: @echo " " @echo "Deprecated!!" - @echo "cd $(PACKAGES_SRC) && make noncvs_install" - cd $(PACKAGES_SRC) && make $(DEST_PATHS) noncvs_install + @echo "cd $(packages_src) && make noncvs_install" + cd $(packages_src) && make $(DEST_PATHS) noncvs_install darwin_app_externals_gem_clean: @echo " " @echo "Deprecated!!" - @echo "cd $(PACKAGES_SRC) && make gem_clean" + @echo "cd $(packages_src) && make gem_clean" darwin_app_externals_gem: @echo " " @echo "Deprecated!!" - @echo "cd $(PACKAGES_SRC) && make gem_install" + @echo "cd $(packages_src) && make gem_install" darwin_app_externals_standard_clean: @echo " " @echo "Deprecated!!" - @echo "cd $(PACKAGES_SRC) && make externals_clean" + @echo "cd $(packages_src) && make externals_clean" darwin_pd_clean: @echo " " @echo "Deprecated!!" - @echo "cd $(PACKAGES_SRC) && make pd_clean" + @echo "cd $(packages_src) && make pd_clean" darwin_app_externals: @echo " " @echo "Deprecated!!" - @echo "cd $(EXTERNALS_SRC) && make install" + @echo "cd $(externals_src) && make install" darwin_app_externals_standard: @echo " " @echo "Deprecated!!" - @echo "cd $(EXTERNALS_SRC) && make install" + @echo "cd $(externals_src) && make install" darwin_patch_pd: @echo " " @@ -354,7 +354,7 @@ darwin_unpatch_pd: darwin_app_docs: @echo " " @echo "Deprecated!!" - @echo "cd $(DOC_SRC) && make install" + @echo "cd $(doc_src) && make install" darwin_app_license: @echo " " diff --git a/packages/patches/build_vars_4_makefile.in.patch b/packages/patches/build_vars_4_makefile.in.patch index d398ae4e..47a43167 100644 --- a/packages/patches/build_vars_4_makefile.in.patch +++ b/packages/patches/build_vars_4_makefile.in.patch @@ -4,22 +4,35 @@ RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.5 diff -u -w -r1.5 makefile.in --- makefile.in 6 Nov 2004 16:07:33 -0000 1.5 -+++ makefile.in 21 Nov 2005 04:32:51 -0000 -@@ -113,29 +113,48 @@ ++++ makefile.in 26 Nov 2005 04:06:12 -0000 +@@ -5,8 +5,8 @@ + EXT= @EXT@ + GUINAME= @GUINAME@ + +-INSTALL_PREFIX = @prefix@ +-GFLAGS = -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" ++prefix = @prefix@ ++GFLAGS = -DINSTALL_PREFIX=\"$(prefix)\" + + MANDIR = @mandir@ + +@@ -112,30 +112,49 @@ + cd ../extra/lrshift~;make @EXTERNTARGET@ cd ../extra/pique;make @EXTERNTARGET@ - INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX) +-INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX) -MANINSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)/$(MANDIR) ++INSTDIR = $(DESTDIR)$(prefix) BINARYMODE=@binarymode@ +# varibles to match packages/Makefile.buildlayout so that they can be easily +# overridden when building extended builds. -+BIN_DEST = $(INSTDIR)/bin -+DOCS_DEST = $(INSTDIR)/doc -+INCLUDE_DEST = $(INSTDIR)/include -+LIBPD_DEST = $(INSTDIR)/lib/pd -+LIBBIN_DEST = $(LIBPD_DEST)/bin -+MAN_DEST = $(INSTDIR)/$(MANDIR) ++bindir = $(INSTDIR)/bin ++pddocdir = $(INSTDIR)/doc ++includedir = $(INSTDIR)/include ++libpddir = $(INSTDIR)/lib/pd ++libpdbindir = $(libpddir)/bin ++mandir = $(DESTDIR)$(MANDIR) + install: all - install -d $(INSTDIR)/lib/pd/bin @@ -31,25 +44,25 @@ diff -u -w -r1.5 makefile.in - install -m755 $(BIN_DIR)/pdsend $(INSTDIR)/bin/pdsend - install -m755 $(BIN_DIR)/pdreceive $(INSTDIR)/bin/pdreceive - cp -pr ../doc ../extra $(INSTDIR)/lib/pd/ -+ install -d $(LIBBIN_DEST) -+ install $(BIN_DIR)/$(GUINAME) $(LIBBIN_DEST)/$(GUINAME) -+ install $(BIN_DIR)/pd-watchdog $(LIBBIN_DEST)/pd-watchdog -+ install -m644 $(BIN_DIR)/pd.tk $(LIBBIN_DEST)/pd.tk -+ install -d $(BIN_DEST) -+ install $(BINARYMODE) $(PDEXEC) $(BIN_DEST)/pd -+ install -m755 $(BIN_DIR)/pdsend $(BIN_DEST)/pdsend -+ install -m755 $(BIN_DIR)/pdreceive $(BIN_DEST)/pdreceive ++ install -d $(libpdbindir) ++ install $(BIN_DIR)/$(GUINAME) $(libpdbindir)/$(GUINAME) ++ install $(BIN_DIR)/pd-watchdog $(libpdbindir)/pd-watchdog ++ install -m644 $(BIN_DIR)/pd.tk $(libpdbindir)/pd.tk ++ install -d $(bindir) ++ install $(BINARYMODE) $(PDEXEC) $(bindir)/pd ++ install -m755 $(BIN_DIR)/pdsend $(bindir)/pdsend ++ install -m755 $(BIN_DIR)/pdreceive $(bindir)/pdreceive + for dir in $(shell ls -1 ../doc | grep -v CVS); do \ + echo "installing $$dir"; \ -+ install -d $(DOCS_DEST)/$$dir ; \ -+ install -p ../doc/$$dir/*.* $(DOCS_DEST)/$$dir ; \ ++ install -d $(pddocdir)/$$dir ; \ ++ install -p ../doc/$$dir/*.* $(pddocdir)/$$dir ; \ + done + for dir in $(shell ls -1 ../doc/7.stuff | grep -v CVS); do \ + echo "installing 7.stuff/$$dir"; \ -+ install -d $(DOCS_DEST)/7.stuff/$$dir ; \ -+ install -p ../doc/7.stuff/$$dir/*.* $(DOCS_DEST)/7.stuff/$$dir ; \ ++ install -d $(pddocdir)/7.stuff/$$dir ; \ ++ install -p ../doc/7.stuff/$$dir/*.* $(pddocdir)/7.stuff/$$dir ; \ + done -+ cp -pr ../extra $(LIBPD_DEST)/ ++ cp -pr ../extra $(libpddir)/ rm -f $(INSTDIR)/extra/*/*.o - install -d $(INSTDIR)/include - install -m644 m_pd.h $(INSTDIR)/include/m_pd.h @@ -60,15 +73,15 @@ diff -u -w -r1.5 makefile.in - chmod 644 $(MANINSTDIR)/man1/pdsend.1.gz - gzip < ../man/pdreceive.1 > $(MANINSTDIR)/man1/pdreceive.1.gz - chmod 644 $(MANINSTDIR)/man1/pdreceive.1.gz -+ install -d $(INCLUDE_DEST) -+ install -m644 m_pd.h $(INCLUDE_DEST)/m_pd.h -+ install -d $(MAN_DEST)/man1 -+ gzip < ../man/pd.1 > $(MAN_DEST)/man1/pd.1.gz -+ chmod 644 $(MAN_DEST)/man1/pd.1.gz -+ gzip < ../man/pdsend.1 > $(MAN_DEST)/man1/pdsend.1.gz -+ chmod 644 $(MAN_DEST)/man1/pdsend.1.gz -+ gzip < ../man/pdreceive.1 > $(MAN_DEST)/man1/pdreceive.1.gz -+ chmod 644 $(MAN_DEST)/man1/pdreceive.1.gz ++ install -d $(includedir) ++ install -m644 m_pd.h $(includedir)/m_pd.h ++ install -d $(mandir)/man1 ++ gzip < ../man/pd.1 > $(mandir)/man1/pd.1.gz ++ chmod 644 $(mandir)/man1/pd.1.gz ++ gzip < ../man/pdsend.1 > $(mandir)/man1/pdsend.1.gz ++ chmod 644 $(mandir)/man1/pdsend.1.gz ++ gzip < ../man/pdreceive.1 > $(mandir)/man1/pdreceive.1.gz ++ chmod 644 $(mandir)/man1/pdreceive.1.gz + @echo "Pd install succeeded." local-clean: @@ -85,14 +98,14 @@ diff -u -w -r1.5 makefile.in - rm -f $(MANINSTDIR)/man1/pd.1.gz - rm -f $(MANINSTDIR)/man1/pdsend.1.gz - rm -f $(MANINSTDIR)/man1/pdreceive.1.gz -+ rm -f -r $(LIBPD_DEST) -+ rm -f $(BIN_DEST)/pd -+ rm -f $(BIN_DEST)/pdsend -+ rm -f $(BIN_DEST)/pdreceive -+ rm -f $(INCLUDE_DEST)/m_pd.h -+ rm -f $(MAN_DEST)/man1/pd.1.gz -+ rm -f $(MAN_DEST)/man1/pdsend.1.gz -+ rm -f $(MAN_DEST)/man1/pdreceive.1.gz ++ rm -f -r $(libpddir) ++ rm -f $(bindir)/pd ++ rm -f $(bindir)/pdsend ++ rm -f $(bindir)/pdreceive ++ rm -f $(includedir)/m_pd.h ++ rm -f $(mandir)/man1/pd.1.gz ++ rm -f $(mandir)/man1/pdsend.1.gz ++ rm -f $(mandir)/man1/pdreceive.1.gz include makefile.dependencies diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile index fa9745a8..0bd7b558 100755 --- a/packages/win32_inno/Makefile +++ b/packages/win32_inno/Makefile @@ -5,8 +5,8 @@ all: install CWD := $(shell pwd) -INSTALL_PREFIX = $(CWD)/build -SRC_ROOT_DIR = $(CWD)/../.. +prefix = $(CWD)/build +cvs_root_dir = $(CWD)/../.. BUILDLAYOUT_DIR = $(CWD)/.. @@ -16,8 +16,8 @@ include $(BUILDLAYOUT_DIR)/Makefile.buildlayout # these are sent to all of the various Makefiles so that they all copy their # output to the same directory tree DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \ - SRC_ROOT_DIR=$(SRC_ROOT_DIR) \ - INSTALL_PREFIX=$(INSTALL_PREFIX) \ + cvs_root_dir=$(cvs_root_dir) \ + prefix=$(prefix) \ UNAME=$(UNAME) @@ -47,5 +47,5 @@ $(PD_ISS_NAME): $(PD_ISS_NAME).in #==============================================================================# extended_install: - cd $(PACKAGES_SRC) && make $(DEST_PATHS) install + cd $(packages_src) && make $(DEST_PATHS) install -- cgit v1.2.1