about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2012-06-21 18:57:52 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2012-06-21 18:57:52 +0000
commita9558eab4deaa4706483ab905e17310f6b3caa5f (patch)
treedb21ef87cfa26c11b3200cba72233c10bcfcdbea
parenta4f37320456cb9e9105fe7b2f82d189dd7f062dd (diff)
downloadnetpbm-mirror-a9558eab4deaa4706483ab905e17310f6b3caa5f.tar.gz
netpbm-mirror-a9558eab4deaa4706483ab905e17310f6b3caa5f.tar.xz
netpbm-mirror-a9558eab4deaa4706483ab905e17310f6b3caa5f.zip
Put -lm in the proper place inlink order
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1694 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--common.mk4
-rw-r--r--doc/HISTORY4
2 files changed, 6 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 01fb6d91..f93c9e0f 100644
--- a/common.mk
+++ b/common.mk
@@ -347,8 +347,8 @@ MATHLIB ?= -lm
 
 # Note that LDFLAGS might contain -L options, so order is important.
 # LDFLAGS is commonly set as an environment variable.
-LDFLAGS_ALL = $(MATHLIB) $(shell $(LIBOPT) $(NETPBMLIB)) \
- $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD)
+LDFLAGS_ALL = $(shell $(LIBOPT) $(NETPBMLIB)) \
+ $(LDFLAGS) $(LDLIBS) $(MATHLIB) $(RPATH) $(LADD)
 
 $(PORTBINARIES) $(MATHBINARIES): %: %.o $(NETPBMLIB) $(LIBOPT)
 	$(LD) -o $@ $@.o $(LDFLAGS_ALL)
diff --git a/doc/HISTORY b/doc/HISTORY
index e827dea5..a2da6e0a 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -17,6 +17,10 @@ not yet  BJH  Release 10.59.00
 
               pamstereogram: fix crash introduced in 10.53 (December 2010).
 
+              Build: fix bug: declines to build pnmtops.  Broken in 10.58.
+
+              Build: move -lm to end of -l's.  Broken at least since 10.35.
+
 12.03.29 BJH  Release 10.58.00
 
               Add ppmtospu, 22 years late.