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 ++--- 3 files changed, 197 insertions(+), 197 deletions(-) (limited to 'abstractions') 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 -- cgit v1.2.1