diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2010-04-12 22:26:38 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2010-04-12 22:26:38 +0000 |
| commit | cc7856d67788239c019d23085e534d4baf58f0da (patch) | |
| tree | eea7d514f41591b4378677e0e584c659ae931e3c | |
| parent | cb01a85bd7b2cb1fde9156475f4be8b544a4040f (diff) | |
consolidated 'pddp' lib stuff into a single place to make a libdir, ease Debian packaging, and remove the pddpserver
svn path=/trunk/; revision=13424
| -rw-r--r-- | abstractions/Makefile | 12 | ||||
| -rw-r--r-- | externals/Makefile | 29 |
2 files changed, 6 insertions, 35 deletions
diff --git a/abstractions/Makefile b/abstractions/Makefile index 2d4433d0..c29d1f69 100644 --- a/abstractions/Makefile +++ b/abstractions/Makefile @@ -27,7 +27,7 @@ include $(BUILDLAYOUT_DIR)/Makefile.buildlayout # # WARNING! this MUST be all on one line because the automatic package # building scripts rely on it being that way. -LIB_TARGETS = controctopus jmmmp keyboardkeys la-kitchen list-abs memento nusmuk nqpoly nsend parazit pddp pixeltango purepd rradical rtc-lib timestretch memento-p sfruit pd-wavelet +LIB_TARGETS = controctopus jmmmp keyboardkeys la-kitchen list-abs memento nusmuk nqpoly nsend parazit pixeltango purepd rradical rtc-lib timestretch memento-p sfruit pd-wavelet # in case anything needs to be compiled or processed somehow before installing all: @@ -271,16 +271,6 @@ parazit_install: #------------------------------------------------------------------------------- -# PDDP support lib -PDDP_NAME = pddp -pddp_install: - install -d $(DESTDIR)$(objectsdir)/$(PDDP_NAME) - install -p $(abstractions_src)/pddp/*.pd $(DESTDIR)$(objectsdir)/$(PDDP_NAME) - $(scripts_src)/generate-libdir-metafile.sh $(DESTDIR)$(objectsdir) $(PDDP_NAME) \ - --license "GNU GPL" \ - --description "support objects for the Pure Data Documentation Project" - -#------------------------------------------------------------------------------- # mtl MTL_NAME = mtl mtl_install: diff --git a/externals/Makefile b/externals/Makefile index 57afa495..cb3bd150 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -1446,33 +1446,14 @@ pan_clean: #------------------------------------------------------------------------------# # PDDP -PDDP_NAME=pddp -pddp: $(bindir) - $(MAKE) OPT_CFLAGS="-O2 -fno-strict-aliasing -fPIC" \ - -C $(externals_src)/miXed/pddp - - -pddp_install: pddp - install -d $(DESTDIR)$(objectsdir)/$(PDDP_NAME) -# $(scripts_src)/generate-libdir-metafile.sh $(DESTDIR)$(objectsdir) $(PDDP_NAME) \ -# --author "PDDP" \ -# --license "BSD" \ -# --description "objects for working with Tcl and Pd's Tk GUI" -# pddp is compiled straight into $(OUT_DIR) - cd $(externals_src)/miXed/pddp && $(MAKE) \ - OUT_DIR=$(DESTDIR)$(objectsdir)/$(PDDP_NAME) - install -d $(DESTDIR)$(objectsdir)/$(PDDP_NAME)/pddp - install -p $(externals_src)/miXed/bin/pddp/*.tcl \ - $(DESTDIR)$(objectsdir)/$(PDDP_NAME)/pddp -# install -d $(DESTDIR)$(manualsdir)/$(PDDP_NAME) - install -d $(DESTDIR)$(examplesdir)/$(PDDP_NAME) - install -p $(externals_src)/miXed/test/pddp/*.* \ - $(DESTDIR)$(examplesdir)/$(PDDP_NAME) +pddp: + make -C $(externals_src)/pddp +pddp_install: + make -C $(externals_src)/pddp DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install pddp_clean: - -$(MAKE) -C $(externals_src)/mixed/pddp $(DEST_PATHS) clean - + make -C $(externals_src)/pddp clean #------------------------------------------------------------------------------# |