aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2009-10-30 15:56:31 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2009-10-30 15:56:31 +0000
commit83375c8fe485697ceee927d355dbfa8686f4b6ce (patch)
treecce0ea974d8ca3fcf7a0ec85c9713fc4ab4e484c
parent1af64887f0749b31896efcd0277b821387538244 (diff)
made pdvjtools build using the new template that's in ext13
svn path=/trunk/; revision=12700
-rw-r--r--externals/Makefile44
1 files changed, 7 insertions, 37 deletions
diff --git a/externals/Makefile b/externals/Makefile
index e24bb08b..7acf2383 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -138,7 +138,7 @@ else
LIB_TARGETS += hid pdp pidip gem2pdp iem16 pdp_opengl apple
else
# GNU/Linux, BSD, IRIX, etc.
- LIB_TARGETS += hid pdp pidip gem2pdp iem16 pdp_opengl pdvjtools postlude sixaxis
+ LIB_TARGETS += hid pdp pidip gem2pdp iem16 pdp_opengl postlude sixaxis
endif
endif
@@ -2129,44 +2129,14 @@ pdp_opengl_clean:
#------------------------------------------------------------------------------#
# PDVJTOOLS
-PDVJTOOLS_NAME=pdvjtools
-PDVJTOOLS_OBJECTS := $(wildcard $(externals_src)/pdvjtools/*/*.c)
-# exclude videogrid for now since it doesn't build with ffmpeg from Debian/stable
-PDVJTOOLS_CPP_OBJECTS := $(wildcard $(externals_src)/pdvjtools/[^v]*/*.cc)
-pdvjtools: $(externals_src)/pdp/Makefile.config $(PDVJTOOLS_OBJECTS:.c=.$(EXTENSION)) \
-$(PDVJTOOLS_CPP_OBJECTS:.cc=.$(EXTENSION))
-
-pdvjtools_install: pdvjtools
- install -d $(DESTDIR)$(objectsdir)/$(PDVJTOOLS_NAME)
- $(scripts_src)/generate-libdir-metafile.sh $(DESTDIR)$(objectsdir) $(PDVJTOOLS_NAME) \
- --author "" \
- --description "Pure Data Video Junk"
- install -p $(PDVJTOOLS_OBJECTS:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(PDVJTOOLS_NAME)
- install -p $(PDVJTOOLS_CPP_OBJECTS:.cc=.$(EXTENSION)) \
- $(DESTDIR)$(objectsdir)/$(PDVJTOOLS_NAME)
- install -d $(DESTDIR)$(helpdir)/$(PDVJTOOLS_NAME)
- install -p $(externals_src)/pdvjtools/*/*-help.pd \
- $(DESTDIR)$(helpdir)/$(PDVJTOOLS_NAME)
- install -d $(DESTDIR)$(manualsdir)/$(PDVJTOOLS_NAME)
- install -p $(externals_src)/pdvjtools/pdp_freeframe/INSTALL \
- $(DESTDIR)$(manualsdir)/$(PDVJTOOLS_NAME)/pdp_freeframe_INSTALL
- install -p $(externals_src)/pdvjtools/pdp_frei0r/INSTALL \
- $(DESTDIR)$(manualsdir)/$(PDVJTOOLS_NAME)/pdp_frei0r_INSTALL
-# install -d $(DESTDIR)$(readmesdir)
-# install -p $(externals_src)/pdvjtools/README \
-# $(DESTDIR)$(readmesdir)/$(PDVJTOOLS_NAME).txt
-# install -d $(DESTDIR)$(examplesdir)/$(PDVJTOOLS_NAME)
-# install -p $(externals_src)/pdvjtools/examples/*.pd \
-# $(DESTDIR)$(examplesdir)/$(PDVJTOOLS_NAME)
+pdvjtools:
+ make -C $(externals_src)/pdvjtools
-pdvjtools_clean:
- -rm -f -- $(PDVJTOOLS_OBJECTS:.c=.$(EXTENSION))
- -rm -f -- $(PDVJTOOLS_CPP_OBJECTS:.cc=.$(EXTENSION))
- -rm -f -- $(PDVJTOOLS_OBJECTS:.c=.o)
- -rm -f -- $(PDVJTOOLS_CPP_OBJECTS:.cc=.o)
- -rm -f -- $(externals_src)/pdvjtools/*.bak
- -rm -f -- $(externals_src)/pdvjtools/*.*~
+pdvjtools_install:
+ make -C $(externals_src)/pdvjtools DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
+pdvjtools_clean:
+ make -C $(externals_src)/pdvjtools clean
#------------------------------------------------------------------------------#