Update of /cvsroot/pure-data/packages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28062
Modified Files:
Makefile Makefile.buildlayout TODO
Log Message:
updated names to be more GNU-like and easier to read
Index: Makefile.buildlayout
===================================================================
RCS file: /cvsroot/pure-data/packages/Makefile.buildlayout,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.buildlayout 26 Nov 2005 01:51:35 -0000 1.9
--- Makefile.buildlayout 26 Nov 2005 04:18:51 -0000 1.10
***************
*** 10,19 ****
# kept in each section of the CVS so that each section will be self-contained.
# To use it, you need to include it in your Makefile (i.e. "include
! # Makefile.buildlayout") and then define $(INSTALL_PREFIX) and $(SRC_ROOT_DIR).
#
! # $(SRC_ROOT_DIR) is the base directory of src tree, equivalent to the root
# level of the pure-data CVS.
#
! # $(INSTALL_PREFIX) is the base directory to where all of the resulting files
# will be copied.
#
--- 10,19 ----
# kept in each section of the CVS so that each section will be self-contained.
# To use it, you need to include it in your Makefile (i.e. "include
! # Makefile.buildlayout") and then define $(prefix) and $(cvs_root_dir).
#
! # $(cvs_root_dir) is the base directory of src tree, equivalent to the root
# level of the pure-data CVS.
#
! # $(prefix) is the base directory to where all of the resulting files
# will be copied.
#
***************
*** 64,88 ****
# sources
! ABSTRACTIONS_SRC = $(SRC_ROOT_DIR)/abstractions
! DOC_SRC = $(SRC_ROOT_DIR)/doc
! EXTENSIONS_SRC = $(SRC_ROOT_DIR)/extensions
! EXTERNALS_SRC = $(SRC_ROOT_DIR)/externals
! FLEXT_SRC = $(SRC_ROOT_DIR)/externals/grill/flext
! GEM_SRC = $(SRC_ROOT_DIR)/Gem
! PACKAGES_SRC = $(SRC_ROOT_DIR)/packages
! PD_SRC = $(SRC_ROOT_DIR)/pd
! SCRIPTS_SRC = $(SRC_ROOT_DIR)/scripts
# destinations
! APPLICATIONS_DEST = $(DOCS_DEST)/examples
! BIN_DEST = $(INSTALL_PREFIX)/bin
! DOCS_DEST = $(INSTALL_PREFIX)/doc
! INCLUDE_DEST = $(INSTALL_PREFIX)/include
! LIB_DEST = $(INSTALL_PREFIX)/lib
! MAN_DEST = $(INSTALL_PREFIX)/man
! OBJECTS_DEST = $(INSTALL_PREFIX)/extra
! HELP_DEST = $(DOCS_DEST)/5.reference
! MANUALS_DEST = $(DOCS_DEST)/manuals
--- 64,88 ----
# sources
! abstractions_src = $(cvs_root_dir)/abstractions
! doc_src = $(cvs_root_dir)/doc
! extensions_src = $(cvs_root_dir)/extensions
! externals_src = $(cvs_root_dir)/externals
! flext_src = $(cvs_root_dir)/externals/grill/flext
! gem_src = $(cvs_root_dir)/Gem
! packages_src = $(cvs_root_dir)/packages
! pd_src = $(cvs_root_dir)/pd
! scripts_src = $(cvs_root_dir)/scripts
# destinations
! examplesdir = $(pddocdir)/examples
! bindir = $(prefix)/bin
! pddocdir = $(prefix)/doc
! includedir = $(prefix)/include
! libdir = $(prefix)/lib
! mandir = $(prefix)/man
! objectsdir = $(prefix)/extra
! helpdir = $(pddocdir)/5.reference
! manualsdir = $(pddocdir)/manuals
***************
*** 94,114 ****
# first make sure that the directory structure is setup
! $(INSTALL_PREFIX):
! install -d $(INSTALL_PREFIX)
! $(APPLICATIONS_DEST): $(INSTALL_PREFIX)
! install -d $(APPLICATIONS_DEST)
! $(DOCS_DEST): $(INSTALL_PREFIX)
! install -d $(DOCS_DEST)
! $(HELP_DEST): $(INSTALL_PREFIX)
! install -d $(HELP_DEST)
! $(MANUALS_DEST): $(INSTALL_PREFIX)
! install -d $(MANUALS_DEST)
! $(OBJECTS_DEST): $(INSTALL_PREFIX)
! install -d $(OBJECTS_DEST)
--- 94,114 ----
# first make sure that the directory structure is setup
! $(prefix):
! install -d $(prefix)
! $(examplesdir): $(prefix)
! install -d $(examplesdir)
! $(pddocdir): $(prefix)
! install -d $(pddocdir)
! $(helpdir): $(prefix)
! install -d $(helpdir)
! $(manualsdir): $(prefix)
! install -d $(manualsdir)
! $(objectsdir): $(prefix)
! install -d $(objectsdir)
***************
*** 120,128 ****
! PD_MAJOR_VERSION := $(shell grep 'Pd version' $(PD_SRC)/src/s_main.c | \
sed 's/char pd_version\[\] = "Pd version \([0-9]\)\.[0-9]*[. TES-]*[0-9]*[0-9extndRC.-]*\\n";/\1/')
! PD_MINOR_VERSION := $(shell grep 'Pd version' $(PD_SRC)/src/s_main.c | \
sed 's/char pd_version\[\] = "Pd version [0-9]\.\([0-9]*\)[. TES-]*\([0-9]*\)[0-9extndRC.-]*\\n";/\1/')
! PD_BUGFIX_VERSION := $(shell grep 'Pd version' $(PD_SRC)/src/s_main.c | \
sed 's/char pd_version\[\] = "Pd version [0-9]\.[0-9]*[. TES-]*\([0-9]*\)[0-9extndRC.-]*\\n";/\1/')
# the separators [.-] need to be the same as in s_main.c or the regexps break
--- 120,128 ----
! PD_MAJOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \
sed 's/char pd_version\[\] = "Pd version \([0-9]\)\.[0-9]*[. TES-]*[0-9]*[0-9extndRC.-]*\\n";/\1/')
! PD_MINOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \
sed 's/char pd_version\[\] = "Pd version [0-9]\.\([0-9]*\)[. TES-]*\([0-9]*\)[0-9extndRC.-]*\\n";/\1/')
! PD_BUGFIX_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \
sed 's/char pd_version\[\] = "Pd version [0-9]\.[0-9]*[. TES-]*\([0-9]*\)[0-9extndRC.-]*\\n";/\1/')
# the separators [.-] need to be the same as in s_main.c or the regexps break
***************
*** 143,191 ****
applications_clean:
! -rm -f -- $(APPLICATIONS_DEST)/*/*/*/*/*.*
! -rm -f -- $(APPLICATIONS_DEST)/*/*/*/*.*
! -rm -f -- $(APPLICATIONS_DEST)/*/*/*.*
! -rm -f -- $(APPLICATIONS_DEST)/*/*.*
! -rmdir $(APPLICATIONS_DEST)/*/*/*/*
! -rmdir $(APPLICATIONS_DEST)/*/*/*
! -rmdir $(APPLICATIONS_DEST)/*/*
! -rmdir $(APPLICATIONS_DEST)/*
! -rmdir $(APPLICATIONS_DEST)
help_clean:
! -rm -f -- $(HELP_DEST)/*/*/*.*
! -rm -f -- $(HELP_DEST)/*/*.*
! -rm -f -- $(HELP_DEST)/*.*
! -rmdir $(HELP_DEST)/*/*
! -rmdir $(HELP_DEST)/*
! -rmdir $(HELP_DEST)
manuals_clean:
! -rm -f -- $(MANUALS_DEST)/*/*/*.*
! -rm -f -- $(MANUALS_DEST)/*/*.*
! -rmdir $(MANUALS_DEST)/*/*
! -rmdir $(MANUALS_DEST)/*
! -rmdir $(MANUALS_DEST)
objects_clean:
! -rm $(OBJECTS_DEST)/*/*/*.pd
! -rm $(OBJECTS_DEST)/*/*.pd
! -rm $(OBJECTS_DEST)/*.pd
! -rm $(OBJECTS_DEST)/*/*/*.$(EXTENSION)
! -rm $(OBJECTS_DEST)/*/*.$(EXTENSION)
! -rm $(OBJECTS_DEST)/*.$(EXTENSION)
! -rmdir $(OBJECTS_DEST)/*/*
! -rmdir $(OBJECTS_DEST)/*
! -rmdir $(OBJECTS_DEST)
install_clean: applications_clean help_clean manuals_clean objects_clean
! -rmdir $(DOCS_DEST)
! -rmdir $(INSTALL_PREFIX)
@echo " "
! @echo "Build destination cleaned: $(INSTALL_PREFIX)"
--- 143,191 ----
applications_clean:
! -rm -f -- $(examplesdir)/*/*/*/*/*.*
! -rm -f -- $(examplesdir)/*/*/*/*.*
! -rm -f -- $(examplesdir)/*/*/*.*
! -rm -f -- $(examplesdir)/*/*.*
! -rmdir $(examplesdir)/*/*/*/*
! -rmdir $(examplesdir)/*/*/*
! -rmdir $(examplesdir)/*/*
! -rmdir $(examplesdir)/*
! -rmdir $(examplesdir)
help_clean:
! -rm -f -- $(helpdir)/*/*/*.*
! -rm -f -- $(helpdir)/*/*.*
! -rm -f -- $(helpdir)/*.*
! -rmdir $(helpdir)/*/*
! -rmdir $(helpdir)/*
! -rmdir $(helpdir)
manuals_clean:
! -rm -f -- $(manualsdir)/*/*/*.*
! -rm -f -- $(manualsdir)/*/*.*
! -rmdir $(manualsdir)/*/*
! -rmdir $(manualsdir)/*
! -rmdir $(manualsdir)
objects_clean:
! -rm $(objectsdir)/*/*/*.pd
! -rm $(objectsdir)/*/*.pd
! -rm $(objectsdir)/*.pd
! -rm $(objectsdir)/*/*/*.$(EXTENSION)
! -rm $(objectsdir)/*/*.$(EXTENSION)
! -rm $(objectsdir)/*.$(EXTENSION)
! -rmdir $(objectsdir)/*/*
! -rmdir $(objectsdir)/*
! -rmdir $(objectsdir)
install_clean: applications_clean help_clean manuals_clean objects_clean
! -rmdir $(pddocdir)
! -rmdir $(prefix)
@echo " "
! @echo "Build destination cleaned: $(prefix)"
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/packages/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile 26 Nov 2005 01:51:35 -0000 1.12
--- Makefile 26 Nov 2005 04:18:51 -0000 1.13
***************
*** 10,15 ****
CWD := $(shell pwd)
! SRC_ROOT_DIR = $(CWD)/..
! INSTALL_PREFIX = $(SRC_ROOT_DIR)/packages/build
BUILDLAYOUT_DIR = $(CWD)
--- 10,15 ----
CWD := $(shell pwd)
! cvs_root_dir = $(CWD)/..
! prefix = $(cvs_root_dir)/packages/build
BUILDLAYOUT_DIR = $(CWD)
***************
*** 30,40 ****
CYCLONE_MAJOR_VERSION := $(shell grep CYCLONE_VERSION \
! $(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 | \
cut -d '"' -f 2)
CYCLONE_BUILD := $(shell grep CYCLONE_BUILD \
! $(EXTERNALS_SRC)/miXed/cyclone/build_counter | cut -d ' ' -f 3 | \
cut -d '"' -f 2)
CYCLONE_VERSION := $(CYCLONE_MAJOR_VERSION) $(CYCLONE_RELEASE) $(CYCLONE_BUILD)
--- 30,40 ----
CYCLONE_MAJOR_VERSION := $(shell grep CYCLONE_VERSION \
! $(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 | \
cut -d '"' -f 2)
CYCLONE_BUILD := $(shell grep CYCLONE_BUILD \
! $(externals_src)/miXed/cyclone/build_counter | cut -d ' ' -f 3 | \
cut -d '"' -f 2)
CYCLONE_VERSION := $(CYCLONE_MAJOR_VERSION) $(CYCLONE_RELEASE) $(CYCLONE_BUILD)
***************
*** 42,86 ****
FLEXT_MAJOR_VERSION := $(shell grep FLEXTMAJOR \
! $(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)
FLEXT_MICRO_VERSION := $(shell grep FLEXTMICRO \
! $(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 | \
cut -d '"' -f 2)
MAXLIB_VERSION := $(shell grep "define VERSION" \
! $(EXTERNALS_SRC)/maxlib/maxlib.c | cut -d '"' -f 2)
! 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 | \
cut -d '=' -f 2)
PMPD_VERSION := $(shell grep "define VERSION" \
! $(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 | \
cut -d '"' -f 2)
TOXY_RELEASE := $(shell grep TOXY_RELEASE \
! $(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 | \
cut -d '"' -f 2)
TOXY_VERSION := $(TOXY_MAJOR_VERSION) $(TOXY_RELEASE) $(TOXY_BUILD)
! ZEXY_VERSION := $(shell grep VERSION $(EXTERNALS_SRC)/zexy/src/zexy.h | \
grep -v _VERSION | cut -d ' ' -f 3 | cut -d '"' -f 2)
--- 42,86 ----
FLEXT_MAJOR_VERSION := $(shell grep FLEXTMAJOR \
! $(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)
FLEXT_MICRO_VERSION := $(shell grep FLEXTMICRO \
! $(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 | \
cut -d '"' -f 2)
MAXLIB_VERSION := $(shell grep "define VERSION" \
! $(externals_src)/maxlib/maxlib.c | cut -d '"' -f 2)
! 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 | \
cut -d '=' -f 2)
PMPD_VERSION := $(shell grep "define VERSION" \
! $(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 | \
cut -d '"' -f 2)
TOXY_RELEASE := $(shell grep TOXY_RELEASE \
! $(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 | \
cut -d '"' -f 2)
TOXY_VERSION := $(TOXY_MAJOR_VERSION) $(TOXY_RELEASE) $(TOXY_BUILD)
! ZEXY_VERSION := $(shell grep VERSION $(externals_src)/zexy/src/zexy.h | \
grep -v _VERSION | cut -d ' ' -f 3 | cut -d '"' -f 2)
***************
*** 90,95 ****
# output to the same directory tree
DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \
! SRC_ROOT_DIR=$(SRC_ROOT_DIR) \
! INSTALL_PREFIX=$(INSTALL_PREFIX) \
UNAME=$(UNAME)
--- 90,95 ----
# output to the same directory tree
DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \
! cvs_root_dir=$(cvs_root_dir) \
! prefix=$(prefix) \
UNAME=$(UNAME)
***************
*** 114,118 ****
# externals
externals:
! cd $(EXTERNALS_SRC) && make $(DEST_PATHS)
--- 114,118 ----
# externals
externals:
! cd $(externals_src) && make $(DEST_PATHS)
***************
*** 121,129 ****
flext:
# nusmuk
! cd $(EXTERNALS_SRC)/nusmuk/msd && $(EXTERNALS_SRC)/grill/flext/build.sh \
pd gcc
! cd $(EXTERNALS_SRC)/nusmuk/msd2D && $(EXTERNALS_SRC)/grill/flext/build.sh \
pd gcc
! cd $(EXTERNALS_SRC)/nusmuk/msd3D && $(EXTERNALS_SRC)/grill/flext/build.sh \
pd gcc
--- 121,129 ----
flext:
# nusmuk
! cd $(externals_src)/nusmuk/msd && $(externals_src)/grill/flext/build.sh \
pd gcc
! cd $(externals_src)/nusmuk/msd2D && $(externals_src)/grill/flext/build.sh \
pd gcc
! cd $(externals_src)/nusmuk/msd3D && $(externals_src)/grill/flext/build.sh \
pd gcc
***************
*** 131,135 ****
# Gem
gem:
! # cd $(GEM_SRC)/Gem && xcodebuild
--- 131,135 ----
# Gem
gem:
! # cd $(gem_src)/Gem && xcodebuild
***************
*** 140,158 ****
DESTDIR = ""
ifeq ($(OS_NAME),darwin)
! LIBPD_DEST = $(INSTALL_PREFIX)
! LIBBIN_DEST = $(BIN_DEST)
else
ifeq ($(OS_NAME),win)
! LIBPD_DEST = $(INSTALL_PREFIX)
! LIBBIN_DEST = $(BIN_DEST)
else
! LIBPD_DEST = $(INSTDIR)/lib/pd
! LIBBIN_DEST = $(LIB_DEST)/pd/bin
endif
endif
PD_DEST_PATHS = $(DEST_PATHS) DESTDIR=$(DESTDIR) \
! LIBPD_DEST=$(LIBPD_DEST) \
! LIBBIN_DEST=$(LIBBIN_DEST)
PD_CONFIGURE_FLAGS =
--- 140,158 ----
DESTDIR = ""
ifeq ($(OS_NAME),darwin)
! libpddir = $(prefix)
! libpdbindir = $(bindir)
else
ifeq ($(OS_NAME),win)
! libpddir = $(prefix)
! libpdbindir = $(bindir)
else
! libpddir = $(INSTDIR)/lib/pd
! libpdbindir = $(libpddir)/bin
endif
endif
PD_DEST_PATHS = $(DEST_PATHS) DESTDIR=$(DESTDIR) \
! libpddir=$(libpddir) \
! libpdbindir=$(libpdbindir)
PD_CONFIGURE_FLAGS =
***************
*** 166,175 ****
pd:
! echo "DESTDIR $(DESTDIR) LIBBIN_DEST $(LIBBIN_DEST)"
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) && \
make $(PD_DEST_PATHS) $(PD_EXTRA_FLAGS)
--- 166,175 ----
pd:
! 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) && \
make $(PD_DEST_PATHS) $(PD_EXTRA_FLAGS)
***************
*** 191,200 ****
# abstractions_install
abstractions_install:
! cd $(ABSTRACTIONS_SRC) && make $(DEST_PATHS) install
#------------------------------------------------------------------------------
# doc_install
doc_install:
! cd $(DOC_SRC) && make $(DEST_PATHS) install
--- 191,200 ----
# abstractions_install
abstractions_install:
! cd $(abstractions_src) && make $(DEST_PATHS) install
#------------------------------------------------------------------------------
# doc_install
doc_install:
! cd $(doc_src) && make $(DEST_PATHS) install
***************
*** 202,206 ****
# externals_install
externals_install:
! cd $(EXTERNALS_SRC) && make $(DEST_PATHS) install
--- 202,206 ----
# externals_install
externals_install:
! cd $(externals_src) && make $(DEST_PATHS) install
***************
*** 209,217 ****
flext_install:
# nusmuk
! 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 \
pd gcc install
! cd $(EXTERNALS_SRC)/nusmuk/msd3D && $(EXTERNALS_SRC)/grill/flext/build.sh \
pd gcc install
#TODO: need to add nusmuk/editor
--- 209,217 ----
flext_install:
# nusmuk
! 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 \
pd gcc install
! cd $(externals_src)/nusmuk/msd3D && $(externals_src)/grill/flext/build.sh \
pd gcc install
#TODO: need to add nusmuk/editor
***************
*** 221,238 ****
# 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 \
echo "installing $$dir"; \
! install -d $(APPLICATIONS_DEST)/$(GEM_NAME)/$$dir ; \
! install -p $(GEM_SRC)/examples/$$dir/*.* $(APPLICATIONS_DEST)/$(GEM_NAME)/$$dir ; \
done
--- 221,238 ----
# gem_install
GEM_NAME = gem
! 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 $(examplesdir)/$(GEM_NAME)/$$dir ; \
! install -p $(gem_src)/examples/$$dir/*.* $(examplesdir)/$(GEM_NAME)/$$dir ; \
done
***************
*** 242,249 ****
# 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)
--- 242,249 ----
# this is for including pre-compiled binaries in a build
noncvs_install:
! -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)
***************
*** 253,260 ****
PD_NAME=Pd
pd_install: pd
! 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)
--- 253,260 ----
PD_NAME=Pd
pd_install: pd
! cd $(pd_src)/src && \
make $(PD_DEST_PATHS) $(PD_EXTRA_FLAGS) install
! install -d $(manualsdir)/$(PD_NAME)
! install -p $(pd_src)/src/notes.txt $(manualsdir)/$(PD_NAME)
***************
*** 266,272 ****
#==============================================================================#
! LICENSE_FILE = $(MANUALS_DEST)/$(PD_NAME)/License.html
license_install:
# generate HTML version of License
touch $(LICENSE_FILE)
echo "<html><body>" >> "$(LICENSE_FILE)"
--- 266,273 ----
#==============================================================================#
! 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)"
***************
*** 274,286 ****
echo "<a href="PD%20LICENSE.txt">Pd"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)"
echo "</font></body></html>" >> $(LICENSE_FILE)
# Pd's license file
! install -p "$(PD_SRC)/LICENSE.txt" "$(MANUALS_DEST)/$(PD_NAME)/PD LICENSE.txt"
! WELCOME_FILE = $(MANUALS_DEST)/$(PD_NAME)/Welcome.html
welcome_install:
touch $(WELCOME_FILE)
echo "<html><body><p><p>" >> $(WELCOME_FILE)
--- 275,288 ----
echo "<a href="PD%20LICENSE.txt">Pd"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)"
echo "</font></body></html>" >> $(LICENSE_FILE)
# Pd's license file
! install -p "$(pd_src)/LICENSE.txt" "$(manualsdir)/$(PD_NAME)/PD LICENSE.txt"
! WELCOME_FILE = $(manualsdir)/$(PD_NAME)/Welcome.html
welcome_install:
+ install -d $(manualsdir)/$(PD_NAME)
touch $(WELCOME_FILE)
echo "<html><body><p><p>" >> $(WELCOME_FILE)
***************
*** 289,293 ****
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 "</FONT>" >> $(WELCOME_FILE)
echo "</body></html>" >> $(WELCOME_FILE)
--- 291,295 ----
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 "</FONT>" >> $(WELCOME_FILE)
echo "</body></html>" >> $(WELCOME_FILE)
***************
*** 295,300 ****
! README_FILE = $(MANUALS_DEST)/$(PD_NAME)/ReadMe.html
readme_install:
echo $(CYCLONE_RELEASE)
-rm $(README_FILE)
--- 297,303 ----
! README_FILE = $(manualsdir)/$(PD_NAME)/ReadMe.html
readme_install:
+ install -d $(manualsdir)/$(PD_NAME)
echo $(CYCLONE_RELEASE)
-rm $(README_FILE)
***************
*** 362,374 ****
doc_format:
# clean out cruft files
! -find $(INSTALL_PREFIX) -name .DS_Store -delete
! -find $(INSTALL_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
# 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
--- 365,377 ----
doc_format:
# clean out cruft files
! -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 $(pddocdir) && \
! $(scripts_src)/convert-help-to-standard.sh
# remove write perms to prevent people form editing the helpfiles by mistake
! 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
***************
*** 385,391 ****
patch_pd:
! @echo PD_SRC $(PD_SRC)
# change Pd's version number to reflect the extended build
! cd $(PD_SRC)/src/ && \
sed 's/\(pd_version\[\] = "Pd version \)[0-9extndRC.-]*/\1$(PD_VERSION)-$(PACKAGE_VERSION)/' s_main.c > s_main.c.tmp && \
mv s_main.c.tmp s_main.c
--- 388,394 ----
patch_pd:
! @echo pd_src $(pd_src)
# change Pd's version number to reflect the extended build
! cd $(pd_src)/src/ && \
sed 's/\(pd_version\[\] = "Pd version \)[0-9extndRC.-]*/\1$(PD_VERSION)-$(PACKAGE_VERSION)/' s_main.c > s_main.c.tmp && \
mv s_main.c.tmp s_main.c
***************
*** 393,404 ****
for patch in $(wildcard $(CWD)/patches/*.patch); do \
echo "Applying $$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; \
done
! -rm -f -- $(PD_SRC)/src/configure $(PD_SRC)/src/makefile
@echo " "
@echo "patching succeeded!"
--- 396,407 ----
for patch in $(wildcard $(CWD)/patches/*.patch); do \
echo "Applying $$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; \
done
! -rm -f -- $(pd_src)/src/configure $(pd_src)/src/makefile
@echo " "
@echo "patching succeeded!"
***************
*** 407,411 ****
unpatch_pd:
# this sed pattern won't work with TEST versions
! 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 && \
--- 410,414 ----
unpatch_pd:
# this sed pattern won't work with TEST versions
! 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 && \
***************
*** 414,425 ****
for patch in $(wildcard $(CWD)/patches/*.patch); do \
echo "Applying $$patch"; \
! cd $(PD_SRC)/src/ && patch -p0 -R < $$patch; \
done
# apply all platform-specific patches
for patch in $(wildcard $(CWD)/patches/$(OS_NAME)/*.patch); do \
echo "Applying $$patch"; \
! cd $(PD_SRC)/src/ && patch -p0 -R < $$patch; \
done
! -rm -f -- $(PD_SRC)/src/configure $(PD_SRC)/src/makefile
@echo " "
@echo "unpatching succeeded!"
--- 417,428 ----
for patch in $(wildcard $(CWD)/patches/*.patch); do \
echo "Applying $$patch"; \
! cd $(pd_src)/src/ && patch -p0 -R < $$patch; \
done
# apply all platform-specific patches
for patch in $(wildcard $(CWD)/patches/$(OS_NAME)/*.patch); do \
echo "Applying $$patch"; \
! cd $(pd_src)/src/ && patch -p0 -R < $$patch; \
done
! -rm -f -- $(pd_src)/src/configure $(pd_src)/src/makefile
@echo " "
@echo "unpatching succeeded!"
***************
*** 432,436 ****
#==============================================================================#
abstractions_clean:
! -cd $(ABSTRACTIONS_SRC) && make $(DEST_PATHS) clean
--- 435,439 ----
#==============================================================================#
abstractions_clean:
! -cd $(abstractions_src) && make $(DEST_PATHS) clean
***************
*** 439,443 ****
externals_clean:
! -cd $(EXTERNALS_SRC) && make $(DEST_PATHS) clean
--- 442,446 ----
externals_clean:
! -cd $(externals_src) && make $(DEST_PATHS) clean
***************
*** 449,453 ****
pd_clean:
! -cd $(PD_SRC) && make $(PD_DEST_PATHS) clean
--- 452,456 ----
pd_clean:
! -cd $(pd_src) && make $(PD_DEST_PATHS) clean
Index: TODO
===================================================================
RCS file: /cvsroot/pure-data/packages/TODO,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TODO 26 Nov 2005 01:51:35 -0000 1.8
--- TODO 26 Nov 2005 04:18:51 -0000 1.9
***************
*** 9,12 ****
--- 9,20 ----
- 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
