aboutsummaryrefslogtreecommitdiff
path: root/externals
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2005-12-06 22:17:15 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2005-12-06 22:17:15 +0000
commitcc70508a237f2adbb3cdf471281b9641cec8b623 (patch)
tree5dfca4439652fb2a77f39e1e0b6d5b786b7bc284 /externals
parent3595d550f21f9fae4647c40f6150a691bf1fee8d (diff)
fixed a number of minor bugs, including Frank's patches; added test_location target to check where everything will end up
svn path=/trunk/; revision=4159
Diffstat (limited to 'externals')
-rw-r--r--externals/Makefile6
-rw-r--r--externals/build/darwin/makefile18
2 files changed, 20 insertions, 4 deletions
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)"