aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2013-02-03 21:13:36 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2013-02-03 21:13:36 +0000
commit1036f9774bc7ac1c6a7d51c72d7cf03ee5528446 (patch)
tree7cc611d81ae0bf54f5b2083572029dd00aa670de
parentd289eec2069475a62684e1129c0a1a62d487c9f2 (diff)
update to build oscx template-style
svn path=/trunk/; revision=17020
-rw-r--r--externals/Makefile47
1 files changed, 8 insertions, 39 deletions
diff --git a/externals/Makefile b/externals/Makefile
index 51fc3fb2..3fc76ff9 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -1206,48 +1206,17 @@ osc_clean:
make -C $(externals_src)/mrpeach/osc clean
-#----------------------------------------------------------------------------
-# OSCx
-OSCX_NAME=oscx
-$(externals_src)/OSCx/configure: $(externals_src)/OSCx/configure.ac
- cd $(externals_src)/OSCx && autoconf
-
-$(externals_src)/OSCx/Makefile: $(externals_src)/OSCx/Makefile.in
- cd $(externals_src)/OSCx && ./configure
-$(externals_src)/OSCx/libOSC/Makefile: $(externals_src)/OSCx/libOSC/Makefile.in
- cd $(externals_src)/OSCx && ./configure
-$(externals_src)/OSCx/src/Makefile: $(externals_src)/OSCx/src/Makefile.in
- cd $(externals_src)/OSCx && ./configure
-
-$(externals_src)/OSCx/src/OSCroute.$(EXTENSION): $(externals_src)/OSCx/configure \
-$(externals_src)/OSCx/Makefile
- $(MAKE) -C $(externals_src)/OSCx
-$(externals_src)/OSCx/src/dumpOSC.$(EXTENSION): $(externals_src)/OSCx/configure \
-$(externals_src)/OSCx/Makefile
- $(MAKE) -C $(externals_src)/OSCx
-$(externals_src)/OSCx/src/sendOSC.$(EXTENSION): $(externals_src)/OSCx/configure \
-$(externals_src)/OSCx/Makefile
- $(MAKE) -C $(externals_src)/OSCx
-
-oscx: $(externals_src)/OSCx/src/OSCroute.$(EXTENSION) \
-$(externals_src)/OSCx/src/dumpOSC.$(EXTENSION) \
-$(externals_src)/OSCx/src/sendOSC.$(EXTENSION)
-
-oscx_install: oscx
- install -d $(DESTDIR)$(objectsdir)/$(OSCX_NAME)
- $(scripts_src)/generate-libdir-metafile.sh $(DESTDIR)$(objectsdir) $(OSCX_NAME) \
- --author "<jdl@xdv.org>" \
- --license "BSD" \
- --description "objects for working with OpenSoundControl"
- install -p $(externals_src)/OSCx/src/*.$(EXTENSION) $(DESTDIR)$(objectsdir)/$(OSCX_NAME)
- install -p $(externals_src)/OSCx/doc/*.* $(DESTDIR)$(objectsdir)/$(OSCX_NAME)
+#------------------------------------------------------------------------------#
+# OSCX
+oscx:
+ make -C $(externals_src)/mrpeach/oscx PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)"
+oscx_install:
+ make -C $(externals_src)/mrpeach/oscx STRIP="$(STRIP)" \
+ DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
oscx_clean:
- -$(MAKE) -C $(externals_src)/OSCx $(DEST_PATHS) clean
- -$(MAKE) -C $(externals_src)/OSCx CC=gcc clean
- -rm $(externals_src)/OSCx/Makefile
-
+ make -C $(externals_src)/mrpeach/oscx clean
#------------------------------------------------------------------------------#