diff options
| -rw-r--r-- | packages/Makefile | 36 | ||||
| -rw-r--r-- | packages/Makefile.buildlayout | 26 | ||||
| -rw-r--r-- | packages/darwin_app/Makefile | 18 | ||||
| -rwxr-xr-x | packages/linux_make/Makefile | 18 | ||||
| -rwxr-xr-x | packages/win32_inno/Makefile | 20 |
5 files changed, 59 insertions, 59 deletions
diff --git a/packages/Makefile b/packages/Makefile index 8fc4b46e..891045b7 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -9,7 +9,7 @@ CWD := $(shell pwd) -cvs_root_dir = $(CWD)/.. +cvs_root_dir := $(shell cd $(CWD)/.. && pwd) DESTDIR = $(CWD)/build BUILDLAYOUT_DIR = $(CWD) @@ -115,7 +115,7 @@ doc: #------------------------------------------------------------------------------ # externals externals: - cd $(externals_src) && make $(DEST_PATHS) + $(MAKE) -C $(externals_src) $(DEST_PATHS) #------------------------------------------------------------------------------ @@ -301,24 +301,24 @@ devel_install: pd_devel_install #------------------------------------------------------------------------------ # abstractions_install abstractions_install: - make -C $(abstractions_src) $(DEST_PATHS) install + $(MAKE) -C $(abstractions_src) $(DEST_PATHS) install #------------------------------------------------------------------------------ # doc_install doc_install: - make -C $(doc_src) $(DEST_PATHS) install + $(MAKE) -C $(doc_src) $(DEST_PATHS) install #------------------------------------------------------------------------------ # extensions_install extensions_install: - make -C $(extensions_src) $(DEST_PATHS) install + $(MAKE) -C $(extensions_src) $(DEST_PATHS) install #------------------------------------------------------------------------------ # externals_install externals_install: - make -C $(externals_src) $(DEST_PATHS) install + $(MAKE) -C $(externals_src) $(DEST_PATHS) install @@ -478,14 +478,14 @@ $(gem_src)/src/Gem.pd_linux: $(gem_src)/src/configure cd $(gem_src)/src && aclocal cd $(gem_src)/src && autoconf cd $(gem_src)/src && ./configure --without-ffmpeg --with-pd=$(pd_src) - make -C $(gem_src)/src + $(MAKE) -C $(gem_src)/src $(gem_src)/src/Gem.pd_darwin: $(gem_src)/src/configure # always run aclocal/autoconf until "configure" is deleted from CVS cd $(gem_src)/src && aclocal cd $(gem_src)/src && autoconf cd $(gem_src)/src && ./configure --without-ImageMagick --with-pd=$(pd_src) - make -C $(gem_src)/src + $(MAKE) -C $(gem_src)/src gem: $(gem_src)/src/Gem.$(EXTENSION) @@ -526,7 +526,7 @@ noncvs_install: # pd_install PD_NAME=Pd pd_install: pd - make -C $(pd_src)/src $(DEST_PATHS) $(PD_BUILD_FLAGS) install + $(MAKE) -C $(pd_src)/src $(DEST_PATHS) $(PD_BUILD_FLAGS) install install -d $(manualsdir)/$(PD_NAME) install -p $(pd_src)/src/notes.txt $(manualsdir)/$(PD_NAME) @@ -785,10 +785,12 @@ patch_pd: cd $(pd_src)/src/ && patch -p0 < $$patch; \ done # apply all platform-specific patches +ifneq ($(OS_NAME),windows) for patch in $(shell ls -1 $(CWD)/patches/$(OS_NAME)/*.patch); do \ echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 < $$patch; \ done +endif -rm -f -- $(pd_src)/src/configure $(pd_src)/src/makefile # change Pd's version number to reflect the extended build # this needs the complete_version_defines patch to work @@ -869,14 +871,14 @@ unpatch_pd_devel: # #==============================================================================# abstractions_clean: - -cd $(abstractions_src) && make $(DEST_PATHS) clean + -$(MAKE) -C $(abstractions_src) $(DEST_PATHS) clean doc_clean: externals_clean: - -cd $(externals_src) && make $(DEST_PATHS) clean + -$(MAKE) -C $(externals_src) $(DEST_PATHS) clean flext_clean: @@ -892,7 +894,7 @@ gem_clean: pd_clean: - -cd $(pd_src)/src && make $(DEST_PATHS) clean + -$(MAKE) $(pd_src)/src $(DEST_PATHS) clean # these targets are all from Makefile.buildlayout: install_clean cruft_clean @@ -902,11 +904,11 @@ pd_clean distclean: clean cruft_clean - make -C $(abstractions_src) distclean - make -C $(doc_src) distclean - make -C $(extensions_src) distclean - make -C $(externals_src) distclean - -make -C $(pd_src) distclean + $(MAKE) -C $(abstractions_src) distclean + $(MAKE) -C $(doc_src) distclean + $(MAKE) -C $(extensions_src) distclean + $(MAKE) -C $(externals_src) distclean + -$(MAKE) -C $(pd_src) distclean test_locations: @echo "PD_VERSION: $(PD_VERSION)" diff --git a/packages/Makefile.buildlayout b/packages/Makefile.buildlayout index 6c5af58c..802c244e 100644 --- a/packages/Makefile.buildlayout +++ b/packages/Makefile.buildlayout @@ -40,20 +40,18 @@ UNAME := $(shell uname -s) ifeq ($(UNAME),Linux) OS_NAME = linux EXTENSION = pd_linux -else - ifeq ($(UNAME),Darwin) - OS_NAME = darwin - EXTENSION = pd_darwin - else - ifeq (MINGW,$(findstring MINGW,$(UNAME))) - OS_NAME = windows - EXTENSION = dll - else - OS_NAME = unknown - EXTENSION = so - $(warning WARNING: unknown environment "$(UNAME)".) - endif - endif +endif +ifeq ($(UNAME),Darwin) + OS_NAME = darwin + EXTENSION = pd_darwin +endif +ifeq (MINGW,$(findstring MINGW,$(UNAME))) + OS_NAME = windows + EXTENSION = dll +endif +ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME))) + OS_NAME = windows + EXTENSION = dll endif #==============================================================================# diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile index 6a95e7d9..85144c35 100644 --- a/packages/darwin_app/Makefile +++ b/packages/darwin_app/Makefile @@ -9,8 +9,8 @@ PD_APP_NAME = $(PACKAGE_NAME) PD_APP_CONTENTS = $(BUILD_BASE)/$(PD_APP_NAME).app/Contents DESTDIR = $(PD_APP_CONTENTS)/Resources -cvs_root_dir = $(shell cd $(CWD)/../.. && pwd) -BUILDLAYOUT_DIR = $(shell cd $(CWD)/.. && pwd) +cvs_root_dir := $(shell cd $(CWD)/../.. && pwd) +BUILDLAYOUT_DIR = $(cvs_root_dir)/packages include $(BUILDLAYOUT_DIR)/Makefile.buildlayout @@ -92,10 +92,10 @@ darwin_app_devel: darwin_app_devel_core rez_install # just want to fill it with goodies from CVS. To do so, place your # Pd.app in $(BUILD_BASE)/Pd.app extended_app_install: - cd $(packages_src) && $(MAKE) $(DEST_PATHS) abstractions_install - cd $(packages_src) && $(MAKE) $(DEST_PATHS) doc_install - cd $(packages_src) && $(MAKE) $(DEST_PATHS) extensions_install - cd $(packages_src) && $(MAKE) $(DEST_PATHS) externals_install + $(MAKE) -C $(packages_src) $(DEST_PATHS) abstractions_install + $(MAKE) -C $(packages_src) $(DEST_PATHS) doc_install + $(MAKE) -C $(packages_src) $(DEST_PATHS) extensions_install + $(MAKE) -C $(packages_src) $(DEST_PATHS) externals_install #------------------------------------------------------------------------------# @@ -266,11 +266,11 @@ dmg: distclean: clean - cd $(packages_src) && $(MAKE) $(DEST_PATHS) distclean + $(MAKE) -C $(packages_src) $(DEST_PATHS) distclean clean: package_clean - cd $(packages_src) && $(MAKE) $(DEST_PATHS) clean + $(MAKE) -C $(packages_src) $(DEST_PATHS) clean package_clean: darwin_app_clean @@ -280,7 +280,7 @@ package_clean: darwin_app_clean -rm -f -- "$(CWD)/$(DMG_NAME)/org.puredata.pd.plistx" devel_clean: darwin_app_devel_clean - cd $(packages_src) && $(MAKE) $(DEST_PATHS) clean + $(MAKE) -C $(packages_src) $(DEST_PATHS) clean -rm Info.plist darwin_app_clean: diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile index 1daa4c7d..b0007db0 100755 --- a/packages/linux_make/Makefile +++ b/packages/linux_make/Makefile @@ -5,8 +5,8 @@ CWD := $(shell pwd) DESTDIR = $(CWD)/build/ -cvs_root_dir = $(shell cd $(CWD)/../.. && pwd) -BUILDLAYOUT_DIR = $(shell cd $(CWD)/.. && pwd) +cvs_root_dir := $(shell cd $(CWD)/../.. && pwd) +BUILDLAYOUT_DIR = $(cvs_root_dir)/packages # for command-line UNIX versions, you need to install Pd into the same @@ -42,12 +42,12 @@ DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \ UNAME=$(UNAME) all: - make -C $(packages_src) $(DEST_PATHS) + $(MAKE) -C $(packages_src) $(DEST_PATHS) install: - make -C $(packages_src) $(DEST_PATHS) install - make -C $(packages_src) $(DEST_PATHS) doc_format + $(MAKE) -C $(packages_src) $(DEST_PATHS) install + $(MAKE) -C $(packages_src) $(DEST_PATHS) doc_format @echo " " @echo "linux_make install succeeded!" @@ -111,17 +111,17 @@ installer_clean: #==============================================================================# distclean: clean - make -C $(packages_src) $(DEST_PATHS) distclean + $(MAKE) -C $(packages_src) $(DEST_PATHS) distclean clean: installer_clean - make -C $(packages_src) $(DEST_PATHS) clean + $(MAKE) -C $(packages_src) $(DEST_PATHS) clean test_package: cd /tmp && tar xjf $(DESTDIR)/$(PACKAGE_NAME).tar.bz2 - make -C /tmp/$(PACKAGE_NAME) prefix=/tmp/usr/local install - make -C /tmp/$(PACKAGE_NAME) prefix=/tmp/usr/local uninstall + $(MAKE) -C /tmp/$(PACKAGE_NAME) prefix=/tmp/usr/local install + $(MAKE) -C /tmp/$(PACKAGE_NAME) prefix=/tmp/usr/local uninstall -rmdir /tmp/usr/local -rmdir /tmp/usr -rm -rf -- /tmp/$(PACKAGE_NAME) diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile index 5fa1dcb3..2aaa12de 100755 --- a/packages/win32_inno/Makefile +++ b/packages/win32_inno/Makefile @@ -6,8 +6,8 @@ all: install CWD := $(shell pwd) DESTDIR = $(CWD)/build -cvs_root_dir = $(shell cd $(CWD)/../.. && pwd) -BUILDLAYOUT_DIR = $(shell cd $(CWD)/.. && pwd) +cvs_root_dir := $(shell cd $(CWD)/../.. && pwd) +BUILDLAYOUT_DIR = $(cvs_root_dir)/packages include $(BUILDLAYOUT_DIR)/Makefile.buildlayout @@ -39,13 +39,13 @@ package: $(PD_INNO_SETUP) # makefile.mingw is available from here: # http://sourceforge.net/tracker/index.php?func=detail&aid=1374659&group_id=55736&atid=478072 build_pd: - make -C $(pd_src)/src -f makefile.mingw + $(MAKE) -C $(pd_src)/src -f makefile.mingw pd_install: build_pd # the autoconf/MinGW setup doesn't compile the extras yet -# make -C $(pd_src)/src $(DEST_PATHS) bin -# -make -C $(pd_src)/src $(DEST_PATHS) install - make -C $(pd_src)/src -f makefile.mingw $(DEST_PATHS) install +# $(MAKE) -C $(pd_src)/src $(DEST_PATHS) bin +# -$(MAKE) -C $(pd_src)/src $(DEST_PATHS) install + $(MAKE) -C $(pd_src)/src -f makefile.mingw $(DEST_PATHS) install install: pd_install prebuilt_install lib_install exe_install gripd_hack @echo " " @@ -53,8 +53,8 @@ install: pd_install prebuilt_install lib_install exe_install gripd_hack prebuilt_install: - make -C $(packages_src) $(DEST_PATHS) extended_install - make -C $(packages_src) $(DEST_PATHS) doc_format + $(MAKE) -C $(packages_src) $(DEST_PATHS) extended_install + $(MAKE) -C $(packages_src) $(DEST_PATHS) doc_format install -p pd-settings.reg $(DESTDIR)$(prefix) #==============================================================================# @@ -123,7 +123,7 @@ $(PD_INNO_SETUP): $(PD_INNO_SETUP).in #==============================================================================# distclean: clean - cd $(packages_src) && make $(DEST_PATHS) distclean + $(MAKE) -C $(packages_src) $(DEST_PATHS) distclean package_clean: @@ -133,7 +133,7 @@ package_clean: clean: package_clean - cd $(packages_src) && make $(DEST_PATHS) clean + $(MAKE) -C $(packages_src) $(DEST_PATHS) clean test_locations: |