diff options
| -rw-r--r-- | doc/Makefile | 19 | ||||
| -rw-r--r-- | extensions/Makefile | 20 | ||||
| -rw-r--r-- | externals/Makefile | 6 | ||||
| -rw-r--r-- | externals/build/darwin/makefile | 18 | ||||
| -rw-r--r-- | packages/Makefile | 73 |
5 files changed, 105 insertions, 31 deletions
diff --git a/doc/Makefile b/doc/Makefile index 90a4341e..217104b4 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -155,3 +155,22 @@ devsymlinks: clean: install_clean distclean: clean cruft_clean + + + + +test_locations: + @echo "PD_VERSION: $(PD_VERSION)" + @echo "PACKAGE_VERSION: $(PACKAGE_VERSION)" + @echo "CWD $(CWD)" + @echo "DESTDIR $(DESTDIR)" + @echo "PREFIX $(prefix)" + @echo "BINDIR $(bindir)" + @echo "LIBDIR $(libdir)" + @echo "OBJECTSDIR $(objectsdir)" + @echo "PDDOCDIR $(pddocdir)" + @echo "LIBPDDIR $(libpddir)" + @echo "LIBPDBINDIR $(libpdbindir)" + @echo "HELPDIR $(helpdir)" + @echo "MANUALSDIR $(manualsdir)" + @echo "EXAMPLESDIR $(examplesdir)" diff --git a/extensions/Makefile b/extensions/Makefile index 5841fa06..ae62d325 100644 --- a/extensions/Makefile +++ b/extensions/Makefile @@ -91,3 +91,23 @@ devsymlinks: clean: install_clean distclean: clean cruft_clean + + + + + +test_locations: + @echo "PD_VERSION: $(PD_VERSION)" + @echo "PACKAGE_VERSION: $(PACKAGE_VERSION)" + @echo "CWD $(CWD)" + @echo "DESTDIR $(DESTDIR)" + @echo "PREFIX $(prefix)" + @echo "BINDIR $(bindir)" + @echo "LIBDIR $(libdir)" + @echo "OBJECTSDIR $(objectsdir)" + @echo "PDDOCDIR $(pddocdir)" + @echo "LIBPDDIR $(libpddir)" + @echo "LIBPDBINDIR $(libpdbindir)" + @echo "HELPDIR $(helpdir)" + @echo "MANUALSDIR $(manualsdir)" + @echo "EXAMPLESDIR $(examplesdir)" diff --git a/externals/Makefile b/externals/Makefile index 2c5d8276..8de91620 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -61,7 +61,7 @@ LINUX_CFLAGS = $(CFLAGS) -fPIC LINUX_INCLUDES = $(INCLUDES) LINUX_LDFLAGS = $(LDFLAGS) -Wl,-export_dynamic -shared %.pd_linux: %.c - $(CC) $(CFLAGS) $(INCLUDES) -o "$*.o" -c "../src/$*.c" + $(CC) $(CFLAGS) $(INCLUDES) -o "$*.o" -c "$*.c" gcc $(LINUX_LDFLAGS) -o "$*.pd_linux" "$*.o" -lc -lm chmod a-x "$*.pd_linux" $(STRIP) $*.pd_linux @@ -117,8 +117,8 @@ pre_all_unknown: # INSTALL install: all $(objectsdir) help_install objects_install unfiltered_install \ creb_install cxc_install cyclone_install ext13_install iemabs_install \ -iemabs_install iemmatrix_install pddp_install pdp_install pmpd_install \ -toxy_install unauthorized_install vbap_install zexy_install +iemabs_install iemlib_install iemmatrix_install pddp_install pdp_install \ +pmpd_install toxy_install unauthorized_install vbap_install zexy_install @echo " " @echo "externals install succeeded!" diff --git a/externals/build/darwin/makefile b/externals/build/darwin/makefile index 6fce2309..fd7254f4 100644 --- a/externals/build/darwin/makefile +++ b/externals/build/darwin/makefile @@ -4,7 +4,7 @@ CWD := $(shell pwd) # these are setup to be overridden by the packages/Makefile cvs_root_dir = $(CWD)/../../.. prefix = build -BUILDLAYOUT_DIR = $(CWD)/../.. +BUILDLAYOUT_DIR = $(CWD)/../../../packages all: externals @@ -58,3 +58,19 @@ clean: -rm -rf root *.pkg -rm $(BUILD_DARWIN_SRC)/*~ rm $(BUILD_DARWIN_SRC)/*.pd_darwin + +test_locations: + @echo "PD_VERSION: $(PD_VERSION)" + @echo "PACKAGE_VERSION: $(PACKAGE_VERSION)" + @echo "CWD $(CWD)" + @echo "DESTDIR $(DESTDIR)" + @echo "PREFIX $(prefix)" + @echo "BINDIR $(bindir)" + @echo "LIBDIR $(libdir)" + @echo "OBJECTSDIR $(objectsdir)" + @echo "PDDOCDIR $(pddocdir)" + @echo "LIBPDDIR $(libpddir)" + @echo "LIBPDBINDIR $(libpdbindir)" + @echo "HELPDIR $(helpdir)" + @echo "MANUALSDIR $(manualsdir)" + @echo "EXAMPLESDIR $(examplesdir)" diff --git a/packages/Makefile b/packages/Makefile index 5da16872..37e95721 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -530,57 +530,76 @@ devsymlinks_linux: TCLTK_VERSION=8.4 -devsymlinks_darwin: +devsymlinks_darwin: devsymlinks_clean # this makes /usr/local symlinks to the Tcl/Tk frameworks so that ./configure # can find them. # headers test -e /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Headers/tcl.h && \ - ln -s /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Headers/tcl.h \ - /usr/local/lib/tcl.h + sudo ln -s \ + /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Headers/tcl.h \ + /usr/local/include/tcl.h test -e /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Headers/tclDecls.h && \ - ln -s /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Headers/tclDecls.h \ - /usr/local/lib/tclDecls.h + sudo ln -s \ + /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Headers/tclDecls.h \ + /usr/local/include/tclDecls.h test -e /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Headers/tclPlatDecls.h && \ - ln -s /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Headers/tclPlatDecls.h \ - /usr/local/lib/tclPlatDecls.h + sudo ln -s \ + /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Headers/tclPlatDecls.h \ + /usr/local/include/tclPlatDecls.h # libs test -e /Library/Frameworks/Tcl.framework/tclConfig.sh && \ - ln -s /Library/Frameworks/Tcl.framework/tclConfig.sh /usr/local/lib + sudo ln -s /Library/Frameworks/Tcl.framework/tclConfig.sh /usr/local/lib test -e /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Tcl && \ - ln -s /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Tcl \ + sudo ln -s \ + /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Tcl \ /usr/local/lib/libtcl$(TCLTK_VERSION).dylib test -e /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/libtclstub$(TCLTK_VERSION).a && \ - ln -s /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/libtclstub$(TCLTK_VERSION).a \ + sudo ln -s \ + /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/libtclstub$(TCLTK_VERSION).a \ /usr/local/lib/libtclstub$(TCLTK_VERSION).a test -e /usr/local/lib/libtcl$(TCLTK_VERSION).dylib && \ - ln -s /usr/local/lib/libtcl$(TCLTK_VERSION).dylib /usr/local/lib/libtcl.dylib + sudo ln -s /usr/local/lib/libtcl$(TCLTK_VERSION).dylib /usr/local/lib/libtcl.dylib # headers test -e /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tk.h && \ - ln -s /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tk.h \ - /usr/local/lib/tk.h + sudo ln -s \ + /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tk.h \ + /usr/local/include/tk.h test -e /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkDecls.h && \ - ln -s /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkDecls.h \ - /usr/local/lib/tkDecls.h + sudo ln -s \ + /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkDecls.h \ + /usr/local/include/tkDecls.h test -e /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkIntXlibDecls.h && \ - ln -s /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkIntXlibDecls.h \ - /usr/local/lib/tkIntXlibDecls.h + sudo ln -s \ + /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkIntXlibDecls.h \ + /usr/local/include/tkIntXlibDecls.h test -e /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkMacOSX.h && \ - ln -s /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkMacOSX.h \ - /usr/local/lib/tkMacOSX.h + sudo ln -s \ + /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkMacOSX.h \ + /usr/local/include/tkMacOSX.h test -e /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkPlatDecls.h && \ - ln -s /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkPlatDecls.h \ - /usr/local/lib/tkPlatDecls.h + sudo ln -s \ + /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkPlatDecls.h \ + /usr/local/include/tkPlatDecls.h # libs test -e /Library/Frameworks/Tk.framework/tkConfig.sh && \ - ln -s /Library/Frameworks/Tk.framework/tkConfig.sh /usr/local/lib + sudo ln -s /Library/Frameworks/Tk.framework/tkConfig.sh /usr/local/lib test -e /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Tk && \ - ln -s /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Tk \ + sudo ln -s /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Tk \ /usr/local/lib/libtk$(TCLTK_VERSION).dylib - test -e /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/libtkstub$(TCLTK_VERSION).a && \ - ln -s /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/libtkstub$(TCLTK_VERSION).a \ + test -e /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/libtkstub$(TCLTK_VERSION).a && \ + sudo ln -s \ + /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/libtkstub$(TCLTK_VERSION).a \ /usr/local/lib/libtkstub$(TCLTK_VERSION).a test -e /usr/local/lib/libtk$(TCLTK_VERSION).dylib && \ - ln -s /usr/local/lib/libtk$(TCLTK_VERSION).dylib /usr/local/lib/libtk.dylib + sudo ln -s /usr/local/lib/libtk$(TCLTK_VERSION).dylib /usr/local/lib/libtk.dylib + + + +devsymlinks_clean: + -sudo rm -f /usr/local/include/tcl*.h /usr/local/include/tk*.h + -sudo rm -f /usr/local/lib/tclConfig.sh /usr/local/lib/tkConfig.sh + -sudo rm -f /usr/local/lib/libtcl*.dylib /usr/local/lib/libtk*.dylib + -sudo rm -f /usr/local/lib/libtclstub*.a /usr/local/lib/libtkstub*.a @@ -673,7 +692,7 @@ distclean: clean cruft_clean cd $(externals_src) && make distclean cd $(pd_src) && make distclean -test: +test_locations: @echo "PD_VERSION: $(PD_VERSION)" @echo "PACKAGE_VERSION: $(PACKAGE_VERSION)" @echo "CWD $(CWD)" |