From f4d90a91d0e4c03359f86e0a93f734b6dab47baf Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sun, 21 Feb 2010 06:00:49 +0000 Subject: ported mjlib to template Makefile and debian stuff svn path=/trunk/; revision=13186 --- externals/Makefile | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/externals/Makefile b/externals/Makefile index 6b6ceebc..f0c8ad7d 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -1508,33 +1508,15 @@ maxlib_clean: #------------------------------------------------------------------------------# # MJLIB -MJLIB_NAME=mjlib -# exclude the library file mjLib.c -MJLIB_OBJECTS := $(wildcard $(externals_src)/mjlib/[a-z]?[a-z]*.c) -mjlib: $(MJLIB_OBJECTS:.c=.$(EXTENSION)) - -mjlib_install: mjlib - install -d $(DESTDIR)$(objectsdir)/$(MJLIB_NAME) - $(scripts_src)/generate-libdir-metafile.sh $(DESTDIR)$(objectsdir) $(MJLIB_NAME) \ - --author "mark williamson " \ - --license "GNU GPL" \ - --version "0.1" - install -p $(MJLIB_OBJECTS:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(MJLIB_NAME) - install -d $(DESTDIR)$(helpdir)/$(MJLIB_NAME) - install -p $(wildcard $(externals_src)/mjlib/doc/*.pd) \ - $(DESTDIR)$(helpdir)/$(MJLIB_NAME) - install -p $(wildcard $(externals_src)/mjlib/doc/*.pd) \ - $(DESTDIR)$(objectsdir)/$(MJLIB_NAME) -# install -d $(DESTDIR)$(manualsdir)/$(MJLIB_NAME) - install -d $(DESTDIR)$(readmesdir) - install -p $(externals_src)/mjlib/readme.txt \ - $(DESTDIR)$(readmesdir)/$(MJLIB_NAME).txt +mjlib: + make -C $(externals_src)/mjlib + +mjlib_install: + make -C $(externals_src)/mjlib DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install mjlib_clean: - -rm -f -- $(externals_src)/mjlib/*.$(EXTENSION) - -rm -f -- $(externals_src)/mjlib/*.o - -rm -f -- $(externals_src)/mjlib/*.bak - -rm -f -- $(externals_src)/mjlib/*.*~ + make -C $(externals_src)/mjlib clean + #------------------------------------------------------------------------------# -- cgit v1.2.1