aboutsummaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/Makefile175
-rw-r--r--packages/Makefile.buildlayout136
-rw-r--r--packages/TODO8
-rw-r--r--packages/darwin_app/Makefile196
-rw-r--r--packages/patches/build_vars_4_makefile.in.patch91
-rwxr-xr-xpackages/win32_inno/Makefile10
6 files changed, 320 insertions, 296 deletions
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 <hans@at.or.at>
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 "<html><body>" >> "$(LICENSE_FILE)"
echo "<h3>(Parts of this package can be used under " >> "$(LICENSE_FILE)"
echo "<a href="PD%20LICENSE.txt">Pd&quot;s BSD license</a>)</h3>" >> "$(LICENSE_FILE)"
echo "<font size=\"-1\">" >> "$(LICENSE_FILE)"
- cat "$(EXTERNALS_SRC)/creb/COPYING" | sed -e 's/^$$/\<P\>/g' >> "$(LICENSE_FILE)"
+ cat "$(externals_src)/creb/COPYING" | sed -e 's/^$$/\<P\>/g' >> "$(LICENSE_FILE)"
echo "</font></body></html>" >> $(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 "<html><body><p><p>" >> $(WELCOME_FILE)
echo "<CENTER><IMG SRC=\"logo.jpg\">" >> $(WELCOME_FILE)
echo "<h2>Version $(PD_VERSION)</h2>" >> $(WELCOME_FILE)
echo "<p>written by Miller S. Puckette</p></CENTER>" >> $(WELCOME_FILE)
echo "<FONT SIZE=\"-1\">" >> $(WELCOME_FILE)
- echo "<p>`grep -A9 ACKNOWLEDG $(PD_SRC)/README.txt`</p>" >> $(WELCOME_FILE)
+ echo "<p>`grep -A9 ACKNOWLEDG $(pd_src)/README.txt`</p>" >> $(WELCOME_FILE)
echo "</FONT>" >> $(WELCOME_FILE)
echo "</body></html>" >> $(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. <hans@at.or.at>
-+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