make Pd-extended build override CFLAGS on template-based libraries and remove PD_INCLUDE

svn path=/trunk/; revision=14499

1 files changed, 32 insertions, 32 deletions

diff --git a/externals/Makefile b/externals/Makefile
index 9b0afe3a..71804439 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -289,7 +289,7 @@ aka.wiiremote_clean:
 #------------------------------------------------------------------------------#
 # APPLE
 apple:
-	make -C $(externals_src)/apple PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/apple PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 apple_install:
 	make -C $(externals_src)/apple DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -301,7 +301,7 @@ apple_clean:
 #------------------------------------------------------------------------------#
 # ARRAYSIZE
 arraysize:
-	make -C $(externals_src)/arraysize PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/arraysize PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 arraysize_install:
 	make -C $(externals_src)/arraysize DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -313,7 +313,7 @@ arraysize_clean:
 #------------------------------------------------------------------------------#
 # BASSEMU
 bassemu:
-	make -C $(externals_src)/bassemu~ PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/bassemu~ PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 bassemu_install:
 	make -C $(externals_src)/bassemu~ DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -359,7 +359,7 @@ boids_clean:
 #------------------------------------------------------------------------------#
 # BSAYLOR
 bsaylor:
-	make -C $(externals_src)/bsaylor PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/bsaylor PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 bsaylor_install:
 	make -C $(externals_src)/bsaylor \
@@ -372,7 +372,7 @@ bsaylor_clean:
 #------------------------------------------------------------------------------#
 # COMPORT
 comport:
-	make -C $(externals_src)/iem/comport/comport PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/iem/comport/comport PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 comport_install:
 	make -C $(externals_src)/iem/comport/comport \
@@ -419,7 +419,7 @@ creb_clean:
 #------------------------------------------------------------------------------#
 # CXC
 cxc:
-	make -C $(externals_src)/cxc PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/cxc PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 cxc_install:
 	make -C $(externals_src)/cxc DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -432,7 +432,7 @@ cxc_clean:
 # CYCLONE
 cyclone:
 	make -C $(externals_src)/miXed/cyclone -f Makefile.libdir \
-		PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+		PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 cyclone_install:
 	make -C $(externals_src)/miXed/cyclone -f Makefile.libdir \
@@ -447,7 +447,7 @@ cyclone_clean:
 #------------------------------------------------------------------------------#
 # EKEXT
 ekext:
-	make -C $(externals_src)/ekext PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/ekext PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 ekext_install:
 	make -C $(externals_src)/ekext DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -459,7 +459,7 @@ ekext_clean:
 #------------------------------------------------------------------------------#
 # EXT13
 ext13:
-	make -C $(externals_src)/ext13 PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/ext13 PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 ext13_install:
 	make -C $(externals_src)/ext13 DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -574,7 +574,7 @@ frankenstein_clean:
 #------------------------------------------------------------------------------#
 # FREEVERB
 freeverb:
-	make -C $(externals_src)/freeverb~ PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/freeverb~ PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 freeverb_install:
 	make -C $(externals_src)/freeverb~ DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -632,7 +632,7 @@ gem2pdp_clean:
 #------------------------------------------------------------------------------#
 # GGEE
 ggee:
-	make -C $(externals_src)/ggee PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/ggee PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 ggee_install:
 	make -C $(externals_src)/ggee DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -644,7 +644,7 @@ ggee_clean:
 #------------------------------------------------------------------------------#
 # HCS
 hcs:
-	make -C $(externals_src)/hcs PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/hcs PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 hcs_install:
 	make -C $(externals_src)/hcs DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1046,7 +1046,7 @@ loaders_clean:
 #------------------------------------------------------------------------------#
 # LIBDIR (RENAMED loaders-libdir TO AVOID POTENTIAL CONFLICTS)
 loaders-libdir:
-	make -C $(externals_src)/loaders/libdir PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/loaders/libdir PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 loaders-libdir_install:
 	make -C $(externals_src)/loaders/libdir DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1057,7 +1057,7 @@ loaders-libdir_clean:
 #------------------------------------------------------------------------------#
 # MAPPING
 mapping:
-	make -C $(externals_src)/mapping PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/mapping PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 mapping_install:
 	make -C $(externals_src)/mapping DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1068,7 +1068,7 @@ mapping_clean:
 #------------------------------------------------------------------------------#
 # MARKEX
 markex:
-	make -C $(externals_src)/markex PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/markex PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 markex_install:
 	make -C $(externals_src)/markex DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1079,7 +1079,7 @@ markex_clean:
 #------------------------------------------------------------------------------#
 # MAXLIB
 maxlib:
-	make -C $(externals_src)/maxlib PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/maxlib PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 maxlib_install:
 	make -C $(externals_src)/maxlib DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1091,7 +1091,7 @@ maxlib_clean:
 #------------------------------------------------------------------------------#
 # MJLIB
 mjlib:
-	make -C $(externals_src)/mjlib PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/mjlib PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 mjlib_install:
 	make -C $(externals_src)/mjlib DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1160,7 +1160,7 @@ moocow_clean:
 #------------------------------------------------------------------------------#
 # MOONLIB
 moonlib:
-	make -C $(externals_src)/moonlib PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/moonlib PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 moonlib_install:
 	make -C $(externals_src)/moonlib DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1173,7 +1173,7 @@ moonlib_clean:
 #------------------------------------------------------------------------------#
 # MOTEX
 motex:
-	make -C $(externals_src)/motex PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/motex PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 motex_install:
 	make -C $(externals_src)/motex DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1267,7 +1267,7 @@ oscx_clean:
 #------------------------------------------------------------------------------#
 # PAN
 pan:
-	make -C $(externals_src)/pan PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/pan PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 pan_install:
 	make -C $(externals_src)/pan DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1279,7 +1279,7 @@ pan_clean:
 #------------------------------------------------------------------------------#
 # PDDP
 pddp:
-	make -C $(externals_src)/pddp PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/pddp PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 pddp_install:
 	make -C $(externals_src)/pddp DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1291,7 +1291,7 @@ pddp_clean:
 #------------------------------------------------------------------------------#
 # PDOGG
 pdogg:
-	make -C $(externals_src)/pdogg PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/pdogg PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 pdogg_install:
 	make -C $(externals_src)/pdogg DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1399,7 +1399,7 @@ pdp_opengl_clean:
 #------------------------------------------------------------------------------#
 # PDVJTOOLS
 pdvjtools:
-	make -C $(externals_src)/pdvjtools PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/pdvjtools PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 pdvjtools_install:
 	make -C $(externals_src)/pdvjtools DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1462,7 +1462,7 @@ pidip_clean:
 #------------------------------------------------------------------------------#
 # PLUGIN
 plugin:
-	make -C $(externals_src)/plugin~ PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/plugin~ PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 plugin_install:
 	make -C $(externals_src)/plugin~ DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1474,7 +1474,7 @@ plugin_clean:
 #------------------------------------------------------------------------------#
 # PMPD
 pmpd:
-	make -C $(externals_src)/pmpd PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/pmpd PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 pmpd_install:
 	make -C $(externals_src)/pmpd DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1522,7 +1522,7 @@ postlude_clean:
 #------------------------------------------------------------------------------#
 # SIGPACK
 sigpack:
-	make -C $(externals_src)/sigpack PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/sigpack PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 sigpack_install:
 	make -C $(externals_src)/sigpack DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1535,7 +1535,7 @@ sigpack_clean:
 #------------------------------------------------------------------------------#
 # SMLIB
 smlib:
-	make -C $(externals_src)/smlib PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/smlib PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 smlib_install:
 	make -C $(externals_src)/smlib DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1574,7 +1574,7 @@ tclpd_clean:
 #------------------------------------------------------------------------------#
 # TKWIDGETS
 tkwidgets:
-	make -C $(externals_src)/tkwidgets PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/tkwidgets PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 tkwidgets_install:
 	make -C $(externals_src)/tkwidgets \
@@ -1703,7 +1703,7 @@ unauthorized_clean:
 #------------------------------------------------------------------------------#
 # VBAP
 vbap:
-	make -C $(externals_src)/vbap PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/vbap PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 vbap_install:
 	make -C $(externals_src)/vbap DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1715,7 +1715,7 @@ vbap_clean:
 #------------------------------------------------------------------------------#
 # VANILLA
 vanilla:
-	make -C $(externals_src)/vanilla PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/vanilla PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 vanilla_install:
 	make -C $(externals_src)/vanilla DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -1727,7 +1727,7 @@ vanilla_clean:
 #------------------------------------------------------------------------------#
 # WINDOWING
 windowing:
-	make -C $(externals_src)/windowing PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/windowing PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 windowing_install:
 	make -C $(externals_src)/windowing DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
@@ -2213,7 +2213,7 @@ iemxmlrpc_clean:
 #------------------------------------------------------------------------------#
 # EARPLUG
 earplug:
-	make -C $(externals_src)/earplug~ PD_PATH=$(pd_src) PD_INCLUDE=$(DESTDIR)$(includedir)
+	make -C $(externals_src)/earplug~ PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
 
 earplug_install:
 	make -C $(externals_src)/earplug~ DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install