diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-06-21 20:40:36 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-06-21 20:40:36 +0000 |
| commit | 67195565d6462a277143e4ef30c2563372a84982 (patch) | |
| tree | 849f3ab79239192e3965f311c58d2fb5dd05500f | |
| parent | 17903bff7378abb0a2e0a6957c1ba0a0eb718646 (diff) | |
| download | netpbm-mirror-67195565d6462a277143e4ef30c2563372a84982.tar.gz netpbm-mirror-67195565d6462a277143e4ef30c2563372a84982.tar.xz netpbm-mirror-67195565d6462a277143e4ef30c2563372a84982.zip | |
Release 10.35.85
git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@1695 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | Makefile.common | 13 | ||||
| -rw-r--r-- | Makefile.version | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 4 |
3 files changed, 16 insertions, 3 deletions
diff --git a/Makefile.common b/Makefile.common index 29465892..21aabb0e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -68,6 +68,15 @@ include $(SRCDIR)/Makefile.version +# The following poses a problem when xml2-config or libpng-config indicates +# (incorrectly) that you need -I /usr/include to compile for them. In that +# case, $(INCLUDES) may include -I /usr/include before the -I's for the local +# directories. So if there is another Netpbm installed in /usr/include, the +# build is wrong (it fails). This is fixed in later Netpbm by changing the +# order, but it is more complex than just moving around the following line, +# because $(INCLUDES) also contains -I's for some local directories, which +# must go before -I importinc. It is too complex for the Super Stable series. +# INCLUDES2 := $(INCLUDES) -I$(SRCDIR)/$(SUBDIR) -I. -I importinc ifeq ($(NETPBMLIBTYPE),unixstatic) @@ -313,8 +322,8 @@ MATHLIB ?= -lm $(PORTBINARIES) $(MATHBINARIES): %: %.o $(NETPBMLIB) $(LIBOPT) # Note that LDFLAGS might contain -L options, so order is important. # LDFLAGS is commonly set as an environment variable. - $(LD) -o $@ $@.o $(MATHLIB) $(shell $(LIBOPT) $(NETPBMLIB)) \ - $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) + $(LD) -o $@ $@.o $(shell $(LIBOPT) $(NETPBMLIB)) \ + $(LDFLAGS) $(LDLIBS) $(MATHLIB) $(RPATH) $(LADD) # MERGE STUFF diff --git a/Makefile.version b/Makefile.version index 516bd9df..7d146e5c 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 35 -NETPBM_POINT_RELEASE = 84 +NETPBM_POINT_RELEASE = 85 diff --git a/doc/HISTORY b/doc/HISTORY index a4929f31..42fc17a7 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,10 @@ Netpbm. CHANGE HISTORY -------------- +12.02.21 BJH Release 10.35.85 + + Build: move -lm to end of -l's. Broken at least since 10.35. + 12.02.14 BJH Release 10.35.84 pamscale: fix all black output with resampling. Always broken. |