aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2012-10-22 23:52:52 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2012-10-22 23:52:52 +0000
commite256cddc1e0fc6bd99f6ccac7f3e01df5a05fb8e (patch)
tree9f74b4b06a083dba7b55fd19cdb8280b09918f99
parent57c3663a64fcc92e37dc3ce075580af67f5bb598 (diff)
update to Makefile v1.0.13, fixing 'make dist' and 'make test'
svn path=/trunk/externals/loaders/tclpd/; revision=16475
-rw-r--r--Makefile145
1 files changed, 81 insertions, 64 deletions
diff --git a/Makefile b/Makefile
index 0241073..1098564 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-## Pd library template version 1.0.11
+## Pd library template version 1.0.13
# For instructions on how to use this template, see:
# http://puredata.info/docs/developer/MakefileTemplate
LIBRARY_NAME = tclpd
@@ -6,7 +6,7 @@ LIBRARY_NAME = tclpd
# add your .c source files, one object per file, to the SOURCES
# variable, help files will be included automatically, and for GUI
# objects, the matching .tcl file too
-SOURCES =
+SOURCES = tclpd.c
# list all pd objects (i.e. myobject.pd) files here, and their helpfiles will
# be included automatically
@@ -18,15 +18,18 @@ EXAMPLES = bitmap-help.pd bitmap-madness.pd bitmap.tcl colorpicker.tcl dynreceiv
# manuals and related files, in the 'manual' subfolder
MANUAL =
-# tclpd-specific source files
-TCLPD_SOURCES = hashtable.c tcl_class.c tcl_loader.c tcl_proxyinlet.c tcl_typemap.c tcl_widgetbehavior.c
-
# if you want to include any other files in the source and binary tarballs,
# list them here. This can be anything from header files, test patches,
# documentation, etc. README.txt and LICENSE.txt are required and therefore
# automatically included
-EXTRA_DIST = tclpd.i tclpd.h tclpd.tcl $(TCLPD_SOURCES) ChangeLog.txt AUTHORS.txt TODO.txt
+EXTRA_DIST = tclpd.i tclpd.h hashtable.h $(EXTRA_SOURCES) ChangeLog.txt AUTHORS.txt TODO.txt
+
+# unit tests and related files here, in the 'unittests' subfolder
+UNITTESTS =
+# tclpd-specific source files
+# NOTE: modified to build and link these all into tclpd.pd_linux
+EXTRA_SOURCES = hashtable.c tcl_class.c tcl_loader.c tcl_proxyinlet.c tcl_typemap.c tcl_widgetbehavior.c
#------------------------------------------------------------------------------#
@@ -35,11 +38,11 @@ EXTRA_DIST = tclpd.i tclpd.h tclpd.tcl $(TCLPD_SOURCES) ChangeLog.txt AUTHORS.tx
#
#------------------------------------------------------------------------------#
-ALL_CFLAGS = $(PD_INCLUDES) -std=c99 -I/usr/include/tcl8.5 \
+ALL_CFLAGS = -I"$(PD_INCLUDE)" -std=c99 -I/usr/include/tcl8.5 \
-I/Library/Frameworks/Tcl.framework/Headers \
-Wall -W -Wno-unused-parameter \
-DHASHTABLE_COPY_KEYS
-ALL_LDFLAGS =
+ALL_LDFLAGS = -fPIC
SHARED_LDFLAGS =
ALL_LIBS =
LIBS_linux = -ltcl8.5
@@ -64,17 +67,7 @@ LIBRARY_VERSION = $(shell sed -n 's|^\#X text [0-9][0-9]* [0-9][0-9]* VERSION \(
ALL_CFLAGS += -DPD -DVERSION='"$(LIBRARY_VERSION)"'
-ifeq ($(PD_INCLUDE),)
- # pd default include paths to search for
- PD_INCLUDES = \
- -I"$(PD_PATH)/include/pdextended" \
- -I"$(PD_PATH)/include/pd" \
- -I"$(PD_PATH)/include" \
- -I"$(PD_PATH)/src"
-else
- PD_INCLUDES = -I"$(PD_INCLUDE)"
-endif
-
+PD_INCLUDE = $(PD_PATH)/include/pd
# where to install the library, overridden below depending on platform
prefix = /usr/local
libdir = $(prefix)/lib
@@ -100,7 +93,7 @@ ifeq ($(UNAME),Darwin)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
OS = iphoneos
- PD_PATH ?= /Applications/Pd-extended.app/Contents/Resources
+ PD_PATH = /Applications/Pd-extended.app/Contents/Resources
IPHONE_BASE=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin
CC=$(IPHONE_BASE)/gcc
CPP=$(IPHONE_BASE)/cpp
@@ -119,7 +112,7 @@ ifeq ($(UNAME),Darwin)
EXTENSION = pd_darwin
SHARED_EXTENSION = dylib
OS = macosx
- PD_PATH ?= /Applications/Pd-extended.app/Contents/Resources
+ PD_PATH = /Applications/Pd-extended.app/Contents/Resources
OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast
# build universal 32-bit on 10.4 and 32/64 on newer
ifeq ($(shell uname -r | sed 's|\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*|\1|'), 8)
@@ -131,7 +124,10 @@ ifeq ($(UNAME),Darwin)
ALL_CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include
# if the 'pd' binary exists, check the linking against it to aid with stripping
BUNDLE_LOADER = $(shell test ! -e $(PD_PATH)/bin/pd || echo -bundle_loader $(PD_PATH)/bin/pd)
- ALL_LDFLAGS += $(FAT_FLAGS) -bundle $(BUNDLE_LOADER) -undefined dynamic_lookup -L/sw/lib
+ ALL_LDFLAGS += $(FAT_FLAGS) -headerpad_max_install_names -bundle $(BUNDLE_LOADER) \
+ -undefined dynamic_lookup -L/sw/lib
+ SHARED_LDFLAGS += $(FAT_FLAGS) -dynamiclib -undefined dynamic_lookup \
+ -install_name @loader_path/$(SHARED_LIB) -compatibility_version 1 -current_version 1.0
ALL_LIBS += -lc $(LIBS_macosx)
STRIP = strip -x
DISTBINDIR=$(DISTDIR)-$(OS)
@@ -147,7 +143,7 @@ ifeq ($(UNAME),ANDROID)
EXTENSION = pd_linux
SHARED_EXTENSION = so
OS = android
- PD_PATH ?= /usr
+ PD_PATH = /usr
NDK_BASE := /usr/local/android-ndk
NDK_PLATFORM_VERSION := 5
NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_VERSION)/arch-arm
@@ -169,10 +165,10 @@ ifeq ($(UNAME),Linux)
EXTENSION = pd_linux
SHARED_EXTENSION = so
OS = linux
- PD_PATH ?= /usr
+ PD_PATH = /usr
OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
ALL_CFLAGS += -fPIC
- ALL_LDFLAGS += -rdynamic -shared -fPIC
+ ALL_LDFLAGS += -rdynamic -shared -fPIC -Wl,-rpath,"\$$ORIGIN",--enable-new-dtags
SHARED_LDFLAGS += -Wl,-soname,$(SHARED_LIB) -shared
ALL_LIBS += -lc $(LIBS_linux)
STRIP = strip --strip-unneeded -R .note -R .comment
@@ -185,10 +181,10 @@ ifeq ($(UNAME),GNU)
EXTENSION = pd_linux
SHARED_EXTENSION = so
OS = linux
- PD_PATH ?= /usr
+ PD_PATH = /usr
OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
ALL_CFLAGS += -fPIC
- ALL_LDFLAGS += -rdynamic -shared -fPIC
+ ALL_LDFLAGS += -rdynamic -shared -fPIC -Wl,-rpath,"\$$ORIGIN",--enable-new-dtags
SHARED_LDFLAGS += -shared -Wl,-soname,$(SHARED_LIB)
ALL_LIBS += -lc $(LIBS_linux)
STRIP = strip --strip-unneeded -R .note -R .comment
@@ -201,10 +197,10 @@ ifeq ($(UNAME),GNU/kFreeBSD)
EXTENSION = pd_linux
SHARED_EXTENSION = so
OS = linux
- PD_PATH ?= /usr
+ PD_PATH = /usr
OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
ALL_CFLAGS += -fPIC
- ALL_LDFLAGS += -rdynamic -shared -fPIC
+ ALL_LDFLAGS += -rdynamic -shared -fPIC -Wl,-rpath,"\$$ORIGIN",--enable-new-dtags
SHARED_LDFLAGS += -shared -Wl,-soname,$(SHARED_LIB)
ALL_LIBS += -lc $(LIBS_linux)
STRIP = strip --strip-unneeded -R .note -R .comment
@@ -216,7 +212,7 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
EXTENSION = dll
SHARED_EXTENSION = dll
OS = cygwin
- PD_PATH ?= $(shell cygpath $$PROGRAMFILES)/pd
+ PD_PATH = $(shell cygpath $$PROGRAMFILES)/pd
OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
ALL_CFLAGS +=
ALL_LDFLAGS += -rdynamic -shared -L"$(PD_PATH)/src" -L"$(PD_PATH)/bin"
@@ -231,14 +227,15 @@ ifeq (MINGW,$(findstring MINGW,$(UNAME)))
EXTENSION = dll
SHARED_EXTENSION = dll
OS = windows
- PD_PATH ?= $(shell cd "$$PROGRAMFILES/pd" && pwd)
+ PD_PATH = $(shell cd "$$PROGRAMFILES/pd" && pwd)
# MinGW doesn't seem to include cc so force gcc
CC=gcc
OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer
ALL_CFLAGS += -mms-bitfields
- ALL_LDFLAGS += -shared -Wl,--enable-auto-import -fPIC
+ ALL_LDFLAGS += -s -shared -Wl,--enable-auto-import
SHARED_LDFLAGS += -shared
- ALL_LIBS += -L"$(PD_PATH)/src" -L"$(PD_PATH)/bin" -L"$(PD_PATH)/obj" -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 $(LIBS_windows)
+ ALL_LIBS += -L"$(PD_PATH)/src" -L"$(PD_PATH)/bin" -L"$(PD_PATH)/obj" \
+ -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 -liberty $(LIBS_windows)
STRIP = strip --strip-unneeded -R .note -R .comment
DISTBINDIR=$(DISTDIR)-$(OS)
endif
@@ -253,48 +250,46 @@ else
ALL_CFLAGS += $(OPT_CFLAGS)
endif
-ALL_CFLAGS := $(ALL_CFLAGS) $(CFLAGS)
+ALL_CFLAGS := $(ALL_CFLAGS) $(CFLAGS) $(OPT_CFLAGS)
ALL_LDFLAGS := $(LDFLAGS) $(ALL_LDFLAGS)
ALL_LIBS := $(LIBS) $(ALL_LIBS)
-SHARED_SOURCE ?= $(shell test ! -e lib$(LIBRARY_NAME).c || \
- echo lib$(LIBRARY_NAME).c )
+SHARED_SOURCE ?= $(wildcard lib$(LIBRARY_NAME).c)
SHARED_HEADER ?= $(shell test ! -e $(LIBRARY_NAME).h || echo $(LIBRARY_NAME).h)
-SHARED_LIB = $(SHARED_SOURCE:.c=.$(SHARED_EXTENSION))
+SHARED_LIB ?= $(SHARED_SOURCE:.c=.$(SHARED_EXTENSION))
+SHARED_TCL_LIB = $(wildcard lib$(LIBRARY_NAME).tcl)
-.PHONY = install libdir_install single_install install-doc install-examples install-manual clean distclean dist etags $(LIBRARY_NAME)
+.PHONY = install libdir_install single_install install-doc install-examples install-manual install-unittests clean distclean dist etags $(LIBRARY_NAME)
-all: $(LIBRARY_NAME)
+all: $(SOURCES:.c=.$(EXTENSION)) $(SHARED_LIB)
%.o: %.c
$(CC) $(ALL_CFLAGS) -o "$*.o" -c "$*.c"
-%.$(EXTENSION): %.o $(SHARED_LIB)
- $(CC) $(ALL_LDFLAGS) -o "$*.$(EXTENSION)" "$*.o" $(ALL_LIBS) $(SHARED_LIB)
- chmod a-x "$*.$(EXTENSION)"
+tclpd.$(EXTENSION): tclpd.o $(SHARED_LIB) $(EXTRA_SOURCES:.c=.o) tcl_wrap.o
+ $(CC) $(ALL_LDFLAGS) -o "tclpd.$(EXTENSION)" tclpd.o $(EXTRA_SOURCES:.c=.o) tcl_wrap.o $(ALL_LIBS) $(SHARED_LIB)
+ chmod a-x "tclpd.$(EXTENSION)"
tcl_wrap.c: tclpd.i tclpd.h Makefile
- swig -v -tcl -o tcl_wrap.c $(PD_INCLUDES) tclpd.i
+ swig -v -tcl -o tcl_wrap.c -I$(PD_INCLUDE) tclpd.i
# this links everything into a single binary file
-$(LIBRARY_NAME): $(SOURCES:.c=.o) $(LIBRARY_NAME).o tcl_wrap.o $(TCLPD_SOURCES:.c=.o)
- $(CC) $(CFLAGS) $(ALL_LDFLAGS) \
- -o $(LIBRARY_NAME).$(EXTENSION) \
- $(SOURCES:.c=.o) $(LIBRARY_NAME).o tcl_wrap.o \
- $(TCLPD_SOURCES:.c=.o) $(ALL_LIBS)
+$(LIBRARY_NAME): $(SOURCES:.c=.o) $(LIBRARY_NAME).o lib$(LIBRARY_NAME).o
+ $(CC) $(ALL_LDFLAGS) -o $(LIBRARY_NAME).$(EXTENSION) $(SOURCES:.c=.o) \
+ $(LIBRARY_NAME).o lib$(LIBRARY_NAME).o $(ALL_LIBS)
chmod a-x $(LIBRARY_NAME).$(EXTENSION)
$(SHARED_LIB): $(SHARED_SOURCE:.c=.o)
- $(CC) $(SHARED_LDFLAGS) -o $(SHARED_LIB) $(SHARED_SOURCE:.c=.o) $(LIBS)
+ $(CC) $(SHARED_LDFLAGS) -o $(SHARED_LIB) $(SHARED_SOURCE:.c=.o) $(ALL_LIBS)
-test:
- make -C tests
+test: tclpd.$(EXTENSION)
+ make -C tests PD_PATH=$(PD_PATH)
-install: single_install
+install: libdir_install
# The meta and help files are explicitly installed to make sure they are
# actually there. Those files are not optional, then need to be there.
-libdir_install: $(SOURCES:.c=.$(EXTENSION)) install-doc install-examples install-manual
+libdir_install: $(SOURCES:.c=.$(EXTENSION)) $(SHARED_LIB) install-doc install-examples install-manual install-unittests
$(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
$(INSTALL_DATA) $(LIBRARY_NAME)-meta.pd \
$(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
@@ -310,12 +305,9 @@ libdir_install: $(SOURCES:.c=.$(EXTENSION)) install-doc install-examples install
test -z "$(strip $(PDOBJECTS))" || \
$(INSTALL_DATA) $(PDOBJECTS) \
$(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
-
-# install library linked as single binary
-single_install: $(LIBRARY_NAME) install-doc install-examples install-manual
- $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
- $(INSTALL_PROGRAM) $(LIBRARY_NAME).$(EXTENSION) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
- $(STRIP) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/$(LIBRARY_NAME).$(EXTENSION)
+ test -z "$(strip $(SHARED_TCL_LIB))" || \
+ $(INSTALL_DATA) $(SHARED_TCL_LIB) \
+ $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
$(INSTALL_DATA) tclpd.tcl $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
ifeq ($(UNAME),Darwin)
# force tclpd to use the Tcl.framework built into Pd-extended
@@ -325,6 +317,12 @@ ifeq ($(UNAME),Darwin)
$(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/$(LIBRARY_NAME).$(EXTENSION)
endif
+# install library linked as single binary
+single_install: $(LIBRARY_NAME) install-doc install-examples install-manual install-unittests
+ $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+ $(INSTALL_PROGRAM) $(LIBRARY_NAME).$(EXTENSION) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+ $(STRIP) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/$(LIBRARY_NAME).$(EXTENSION)
+
install-doc:
$(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
test -z "$(strip $(SOURCES) $(PDOBJECTS))" || \
@@ -347,10 +345,16 @@ install-manual:
$(INSTALL_DATA) manual/$$file $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/manual; \
done
+install-unittests:
+ test -z "$(strip $(UNITTESTS))" || \
+ $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/unittests && \
+ for file in $(UNITTESTS); do \
+ $(INSTALL_DATA) unittests/$$file $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/unittests; \
+ done
clean:
-rm -f -- $(SOURCES:.c=.o) $(SOURCES_LIB:.c=.o) $(SHARED_SOURCE:.c=.o)
- -rm -f -- tcl_wrap.c tcl_wrap.o $(TCLPD_SOURCES:.c=.o)
+ -rm -f -- tcl_wrap.c tcl_wrap.o $(EXTRA_SOURCES:.c=.o)
-rm -f -- $(SOURCES:.c=.$(EXTENSION))
-rm -f -- $(LIBRARY_NAME).o
-rm -f -- $(LIBRARY_NAME).$(EXTENSION)
@@ -387,16 +391,20 @@ dist: $(DISTDIR)
$(INSTALL_DATA) Makefile $(DISTDIR)
$(INSTALL_DATA) README.txt $(DISTDIR)
$(INSTALL_DATA) LICENSE.txt $(DISTDIR)
- $(INSTALL_DATA) $(TCLPD_SOURCES) $(DISTDIR)
+ $(INSTALL_DATA) $(EXTRA_SOURCES) $(DISTDIR)
$(INSTALL_DATA) $(LIBRARY_NAME)-meta.pd $(DISTDIR)
test -z "$(strip $(ALLSOURCES))" || \
$(INSTALL_DATA) $(ALLSOURCES) $(DISTDIR)
test -z "$(strip $(wildcard $(ALLSOURCES:.c=.tcl)))" || \
$(INSTALL_DATA) $(wildcard $(ALLSOURCES:.c=.tcl)) $(DISTDIR)
+ test -z "$(strip $(wildcard $(LIBRARY_NAME).c))" || \
+ $(INSTALL_DATA) $(LIBRARY_NAME).c $(DISTDIR)
test -z "$(strip $(SHARED_HEADER))" || \
$(INSTALL_DATA) $(SHARED_HEADER) $(DISTDIR)
test -z "$(strip $(SHARED_SOURCE))" || \
$(INSTALL_DATA) $(SHARED_SOURCE) $(DISTDIR)
+ test -z "$(strip $(SHARED_TCL_LIB))" || \
+ $(INSTALL_DATA) $(SHARED_TCL_LIB) $(DISTDIR)
test -z "$(strip $(PDOBJECTS))" || \
$(INSTALL_DATA) $(PDOBJECTS) $(DISTDIR)
test -z "$(strip $(HELPPATCHES))" || \
@@ -413,6 +421,11 @@ dist: $(DISTDIR)
for file in $(MANUAL); do \
$(INSTALL_DATA) manual/$$file $(DISTDIR)/manual; \
done
+ test -z "$(strip $(UNITTESTS))" || \
+ $(INSTALL_DIR) $(DISTDIR)/unittests && \
+ for file in $(UNITTESTS); do \
+ $(INSTALL_DATA) unittests/$$file $(DISTDIR)/unittests; \
+ done
tar --exclude-vcs -czpf $(DISTDIR).tar.gz $(DISTDIR)
# make a Debian source package
@@ -425,8 +438,12 @@ dpkg-source:
rm -rf -- $(DISTDIR) $(ORIGDIR)
cd .. && dpkg-source -b $(LIBRARY_NAME)
-etags:
- etags *.h $(SOURCES) ../../pd/src/*.[ch] /usr/include/*.h /usr/include/*/*.h
+etags: TAGS
+
+TAGS: $(wildcard $(PD_INCLUDE)/*.h) $(SOURCES) $(SHARED_SOURCE) $(SHARED_HEADER)
+ etags $(wildcard $(PD_INCLUDE)/*.h)
+ etags -a *.h $(SOURCES) $(SHARED_SOURCE) $(SHARED_HEADER) $(EXTRA_SOURCES)
+ etags -a --language=none --regex="/proc[ \t]+\([^ \t]+\)/\1/" *.tcl
showsetup:
@echo "CC: $(CC)"
@@ -437,7 +454,6 @@ showsetup:
@echo "ALL_LDFLAGS: $(ALL_LDFLAGS)"
@echo "ALL_LIBS: $(ALL_LIBS)"
@echo "PD_INCLUDE: $(PD_INCLUDE)"
- @echo "PD_INCLUDES: $(PD_INCLUDES)"
@echo "PD_PATH: $(PD_PATH)"
@echo "objectsdir: $(objectsdir)"
@echo "LIBRARY_NAME: $(LIBRARY_NAME)"
@@ -446,6 +462,7 @@ showsetup:
@echo "SHARED_HEADER: $(SHARED_HEADER)"
@echo "SHARED_SOURCE: $(SHARED_SOURCE)"
@echo "SHARED_LIB: $(SHARED_LIB)"
+ @echo "SHARED_TCL_LIB: $(SHARED_TCL_LIB)"
@echo "PDOBJECTS: $(PDOBJECTS)"
@echo "ALLSOURCES: $(ALLSOURCES)"
@echo "ALLSOURCES TCL: $(wildcard $(ALLSOURCES:.c=.tcl))"