[SCM] pd-lib-builder/master: New upstream version 0.4.4
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Wed Nov 23 21:45:49 UTC 2016
The following commit has been merged in the master branch:
commit f7f332b21797ab2b3decbc436c1566e66a53d8a4
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date: Wed Nov 23 22:37:53 2016 +0100
New upstream version 0.4.4
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 76e273c..58e8b98 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
Changelog for Makefile.pdlibbuilder.
+v0.4.4, dated 2016-11-22
+Use variable 'system' when evaluating 'for{Linux,Darwin,Windows}'
+(bugfix, issue #31, commit 2c14110)
+
v0.4.3, dated 2016-11-02
Replace flags '-fpic' by 'fPIC'.
(bugfix, issue #29, commit 426b38b)
diff --git a/Makefile.pdlibbuilder b/Makefile.pdlibbuilder
index 8aa1cb7..eba47f9 100644
--- a/Makefile.pdlibbuilder
+++ b/Makefile.pdlibbuilder
@@ -1,11 +1,14 @@
-# Makefile.pdlibbuilder dated 2016-11-02
-version = 0.4.3
+# Makefile.pdlibbuilder dated 2016-11-22
+version = 0.4.4
# Helper makefile for Pure Data external libraries.
# Written by Katja Vetter March-June 2015 for the public domain. No warranties.
# Inspired by Hans Christoph Steiner's Makefile Template and Stephan Beal's
# ShakeNMake.
#
+# Grab the newest version of Makefile.pdlibbuilder from
+# https://github.com/pure-data/pd-lib-builder/
+#
# GNU make version >= 3.81 required.
#
#
@@ -106,7 +109,7 @@ version = 0.4.3
#=== descriptions of Makefile.pdlibbuilder API variables =======================
#
#
-# lib.name:
+# lib.name:
# Name of the library directory as it will be installed / distributed. Also the
# name of the lib executable in the case where all classes are linked into
# a single binary.
@@ -116,7 +119,7 @@ version = 0.4.3
# into a single lib binary.
#
# class.sources:
-# All sources files (C or C++) for which the condition holds that
+# All sources files (C or C++) for which the condition holds that
# class name == source file basename.
#
# <classname>.class.sources:
@@ -135,13 +138,13 @@ version = 0.4.3
# link libs) for the whole library. These flags are added to platform-specific
# flags defined by Makefile.pdlibbuilder.
#
-# <classname>.class.ldflags and <classname>.class.ldlibs:
+# <classname>.class.ldflags and <classname>.class.ldlibs:
# Define ldflags resp. ldlibs specific to class <classname>. These flags are
# added to platform-specific flags defined by Makefile.pdlibbuilder, and flags
# defined in your Makefile for the whole library. Note: cflags can not be
# defined per class in the current implementation.
#
-# datafiles and datadirs:
+# datafiles and datadirs:
# All extra files you want to include in binary distributions of the
# library: abstractions and help patches, example patches, meta patch, readme
# and license texts, manuals, sound files, etcetera. Use 'datafiles' for all
@@ -155,7 +158,7 @@ version = 0.4.3
# class.sources += linuxthing.c
# endef
#
-# makefiles and makefiledirs:
+# makefiles and makefiledirs:
# Extra makefiles or directories with makefiles that should be made in sub-make
# processes.
#
@@ -164,7 +167,7 @@ version = 0.4.3
# Makefile.pdlibbuilder will try to build all classes into a single library
# executable (but it will force exit if lib.setup.sources is undefined).
# If your makefile defines 'make-lib-executable=yes' as the library default,
-# this can still be overriden with 'make-lib-executable=no' as command argument
+# this can still be overriden with 'make-lib-executable=no' as command argument
# to build individual class executables (the Makefile.pdlibbuilder default.)
#
# suppress-wunused:
@@ -173,7 +176,7 @@ version = 0.4.3
# but the other warnings from -Wall are retained.
#
# PDDIR:
-# Root directory of 'portable' pd package. When defined, PDINCLUDEDIR and
+# Root directory of 'portable' pd package. When defined, PDINCLUDEDIR and
# PDBINDIR will be evaluated as $(PDDIR)/src and $(PDDIR)/bin.
#
# PDINCLUDEDIR:
@@ -230,9 +233,9 @@ version = 0.4.3
# Source files in directories other than current working directory must be
# prefixed with their relative path. Do not rely on VPATH or vpath.
# Object (.o) files are built in the directory of their source files.
-# Executables are built in current working directory.
+# Executables are built in current working directory.
#
-# Default search path for m_pd.h and other API header files is platform
+# Default search path for m_pd.h and other API header files is platform
# dependent, and overridable by PDINCLUDEDIR:
#
# Linux: /usr/include/pd
@@ -301,7 +304,7 @@ version = 0.4.3
# are upper case. Use target 'allvars' to print all variables and their values.
#
# 'Fields' in data variables are separated by dots, like in 'foo.class.sources'.
-# Words in variables expressing a function or command are separated by dashes,
+# Words in variables expressing a function or command are separated by dashes,
# like in 'make-lib-executable'.
#
#
@@ -325,7 +328,7 @@ version = 0.4.3
#
#=== end of documentation sections =============================================
#
-#
+#
################################################################################
################################################################################
################################################################################
@@ -340,7 +343,7 @@ ifneq ($(firstword $(sort 3.81 $(MAKE_VERSION))), 3.81)
$(error GNU make version 3.81 or higher is required)
endif
-# Relative path to externals root dir in multi-lib source tree like
+# Relative path to externals root dir in multi-lib source tree like
# pd-extended SVN. Default is parent of current working directory. May be
# defined differently in including makefile.
externalsdir ?= ..
@@ -357,7 +360,7 @@ Makefile.pdlibbuilder = true
# strip possibles spaces from lib.name, they mess up calculated file names
lib.name := $(strip $(lib.name))
-# if meta file exists, check library version
+# if meta file exists, check library version
metafile := $(wildcard $(lib.name)-meta.pd)
ifdef metafile
@@ -429,7 +432,7 @@ endif
#=== flags per architecture ====================================================
-# Set architecture-dependent cflags, mainly for Linux. For Mac and Windows,
+# Set architecture-dependent cflags, mainly for Linux. For Mac and Windows,
# arch.c.flags are overriden below.
machine := $(shell uname -m)
@@ -451,7 +454,7 @@ endif
# Intel/AMD 64 bit, build with SSE, SSE2 and SSE3 instructions
ifeq ($(findstring $(machine), ia64 x86_64), $(machine))
- arch.c.flags = -march=core2 -mfpmath=sse -msse -msse2 -msse3
+ arch.c.flags = -march=core2 -mfpmath=sse -msse -msse2 -msse3
endif
@@ -459,27 +462,26 @@ endif
# The following systems are defined: Linux, Darwin, Windows. GNU and
-# GNU/kFreeBSD are treated as Linux to get the same options. System-specific
-# multiline defines (optionally set in library makefile) are conditionally
-# evaluated here.
+# GNU/kFreeBSD are treated as Linux to get the same options.
uname := $(shell uname)
ifeq ($(findstring $(uname), Linux GNU GNU/kFreeBSD), $(uname))
system = Linux
- $(eval $(forLinux))
endif
ifeq ($(uname), Darwin)
system = Darwin
- $(eval $(forDarwin))
endif
ifeq ($(findstring MINGW, $(uname)), MINGW)
system = Windows
- $(eval $(forWindows))
endif
+# evaluate possible system-specific multiline defines from library makefile
+$(eval $(for$(system)))
+
+
# TODO: Cygwin, Android
@@ -520,7 +522,7 @@ ifeq ($(system), Darwin)
/Applications/Pd*.app/Contents/Resources/src))
extension = pd_darwin
cpp.flags := -DUNIX -DMACOSX -I /sw/include
- c.flags :=
+ c.flags :=
c.ldflags := -undefined suppress -flat_namespace -bundle
c.ldlibs := -lc
cxx.ldflags := -undefined suppress -flat_namespace -bundle
@@ -566,7 +568,7 @@ ifeq ($(system), Windows)
endif
endif
-# On Windows we build 32 bit by default to match Pd(-extended) binary
+# On Windows we build 32 bit by default to match Pd(-extended) binary
# distributions. This may change in the future.
# TODO: decide whether -mms-bitfields should be specified.
ifeq ($(system), Windows)
@@ -620,7 +622,7 @@ pdincludepathwithspaces := $(if $(word 2, $(PDINCLUDEDIR)), $(PDINCLUDEDIR))
# From GNU make docs: 'Users expect to be able to specify CFLAGS freely
# themselves.' So we use CFLAGS to define options which are not strictly
-# required for compilation: optimizations, architecture specifications, and
+# required for compilation: optimizations, architecture specifications, and
# warnings. CFLAGS can be safely overriden using a make command argument.
# Variables cflags, ldflags and ldlibs may be defined in including makefile.
@@ -679,7 +681,7 @@ compile-cxx := $(CXX)
all:
# To avoid unpredictable results, make sure the default target is not redefined
-# by including makefile.
+# by including makefile.
ifneq ($(.DEFAULT_GOAL), all)
$(error Default target must be 'all'.)
endif
@@ -753,8 +755,8 @@ MAKEFLAGS += --no-builtin-rules
# Target all forces the build of targets [$(executables) post] in
-# deterministic order. Target $(executables) builds class executables plus
-# optional shared lib or alternatively a single lib executable when
+# deterministic order. Target $(executables) builds class executables plus
+# optional shared lib or alternatively a single lib executable when
# make-lib-executable=true. Target post is optionally defined by
# library makefile.
@@ -960,7 +962,7 @@ endef
%.pre:: %.cc force
$(call make-preprocessor-file,cxx)
-%.pre:: %.cpp force
+%.pre:: %.cpp force
$(call make-preprocessor-file,cxx)
--
pd-lib-builder packaging
More information about the pkg-multimedia-commits
mailing list