diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-09-04 02:29:31 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-09-04 02:29:31 +0000 |
commit | e5f1cbed1e7a98a20185c34b3a5a5ab523acd892 (patch) | |
tree | 810f114e5e954c8b03c3a6d770b1fdd8ca620aed | |
parent | 91c3733c1a396b8c9534b5478448d2fc60fcfc1f (diff) | |
download | netpbm-mirror-e5f1cbed1e7a98a20185c34b3a5a5ab523acd892.tar.gz netpbm-mirror-e5f1cbed1e7a98a20185c34b3a5a5ab523acd892.tar.xz netpbm-mirror-e5f1cbed1e7a98a20185c34b3a5a5ab523acd892.zip |
Fix wrong link order of libraries in fiasco converter links
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2268 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r-- | common.mk | 8 | ||||
-rw-r--r-- | doc/HISTORY | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/common.mk b/common.mk index 54a1484c..a4fed0f0 100644 --- a/common.mk +++ b/common.mk @@ -375,8 +375,12 @@ MATHLIB ?= -lm # Note that LDFLAGS might contain -L options, so order is important. # LDFLAGS is commonly set as an environment variable. -LDFLAGS_ALL = $(shell $(LIBOPT) $(NETPBMLIB)) $(WINICON_OBJECT) \ - $(LDFLAGS_TARGET) $(LDFLAGS) $(LDLIBS) $(MATHLIB) $(RPATH) $(LADD) +# Some of the target-specific libraries are internal Netpbm libraries +# (such as libfiasco), which use Libnetpbm. So we put $(NETPBMLIB) +# after LDFLAGS_TARGET. +LDFLAGS_ALL = $(WINICON_OBJECT) \ + $(LDFLAGS_TARGET) $(shell $(LIBOPT) $(NETPBMLIB)) \ + $(LDFLAGS) $(LDLIBS) $(MATHLIB) $(RPATH) $(LADD) $(PORTBINARIES) $(MATHBINARIES): %: %.o \ $(NETPBMLIB) $(LIBOPT) $(WINICON_OBJECT) diff --git a/doc/HISTORY b/doc/HISTORY index 4f3ef8a4..1e408b48 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -23,6 +23,9 @@ not yet BJH Release 10.68.00 systems. Always broken (pcdovtoppm was new sometime between Netpbm 9.25 (March 2002) and Netpbm 10.11 (Februrary 2010)). + Build: fix undefined symbols in fiasco converters with + static libraries. + Build: provide means of setting the default search path for rgb.txt color database via config.mk. |