diff options
| -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. |