From 1bc923dedb27cc8e610a190d78419a791529e095 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 10 Feb 2010 05:16:14 +0000 Subject: updated all templates with the PDOBJECTS fixes from the 'mapping' build svn path=/trunk/externals/ext13/; revision=13167 --- Makefile | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 81cfc44..d00c36a 100644 --- a/Makefile +++ b/Makefile @@ -130,7 +130,7 @@ endif CFLAGS += $(OPT_CFLAGS) -.PHONY = install libdir_install single_install install-doc install-exec clean dist etags +.PHONY = install libdir_install single_install install-doc install-exec install-examples clean dist etags all: $(SOURCES:.c=.$(EXTENSION)) @@ -155,11 +155,11 @@ libdir_install: $(SOURCES:.c=.$(EXTENSION)) install-doc install-examples $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) $(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd \ $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) - test -z "$(SOURCES)" || (\ + test -z "$(strip $(SOURCES))" || (\ $(INSTALL_FILE) $(SOURCES:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) && \ $(STRIP) $(addprefix $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/,$(SOURCES:.c=.$(EXTENSION)))) - test -z "$(PDOBJECTS)" || \ - $(INSTALL_FILE) $(OBJECTS) \ + test -z "$(strip $(PDOBJECTS))" || \ + $(INSTALL_FILE) $(PDOBJECTS) \ $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) # install library linked as single binary @@ -170,12 +170,13 @@ single_install: $(LIBRARY_NAME) install-doc install-exec install-doc: $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) - test -z "$(SOURCES)" || \ + test -z "$(strip $(SOURCES))" || \ $(INSTALL_FILE) $(SOURCES:.c=-help.pd) \ $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) - test -z "$(PDOBJECTS)" || \ + test -z "$(strip $(PDOBJECTS))" || \ $(INSTALL_FILE) $(PDOBJECTS:.pd=-help.pd) \ $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) +# this is the only bit not really handled well... $(INSTALL_FILE) README $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/README.txt $(INSTALL_FILE) VERSION $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/VERSION.txt $(INSTALL_FILE) CHANGES $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/CHANGES.txt @@ -205,7 +206,7 @@ libdir: all $(DISTBINDIR) $(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd $(DISTBINDIR) $(INSTALL_FILE) $(SOURCES) $(DISTBINDIR) $(INSTALL_FILE) $(SOURCES:.c=-help.pd) $(DISTBINDIR) - test -z "$(EXTRA_DIST)" || \ + test -z "$(strip $(EXTRA_DIST))" || \ $(INSTALL_FILE) $(EXTRA_DIST) $(DISTBINDIR) # tar --exclude-vcs -czpf $(DISTBINDIR).tar.gz $(DISTBINDIR) @@ -215,15 +216,15 @@ $(DISTDIR): dist: $(DISTDIR) $(INSTALL_FILE) Makefile $(DISTDIR) $(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd $(DISTDIR) - test -z "$(ALLSOURCES)" || \ + test -z "$(strip $(ALLSOURCES))" || \ $(INSTALL_FILE) $(ALLSOURCES) $(DISTDIR) - test -z "$(ALLSOURCES)" || \ + test -z "$(strip $(ALLSOURCES))" || \ $(INSTALL_FILE) $(ALLSOURCES:.c=-help.pd) $(DISTDIR) - test -z "$(PDOBJECTS)" || \ + test -z "$(strip $(PDOBJECTS))" || \ $(INSTALL_FILE) $(PDOBJECTS) $(DISTDIR) - test -z "$(PDOBJECTS)" || \ + test -z "$(strip $(PDOBJECTS))" || \ $(INSTALL_FILE) $(PDOBJECTS:.pd=-help.pd) $(DISTDIR) - test -z "$(EXTRA_DIST)" || \ + test -z "$(strip $(EXTRA_DIST))" || \ $(INSTALL_FILE) $(EXTRA_DIST) $(DISTDIR) tar --exclude-vcs -czpf $(DISTDIR).tar.gz $(DISTDIR) -- cgit v1.2.1