From dc623704d3b6f4cadd2036c9627f2ac3054b6b0c Mon Sep 17 00:00:00 2001 From: giraffedata Date: Wed, 3 Dec 2008 20:00:33 +0000 Subject: Move LDFLAGS later git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@775 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- converter/other/Makefile | 40 ++++++++++++++++++------------------ converter/other/cameratopam/Makefile | 4 ++-- converter/other/fiasco/Makefile | 6 +++--- converter/other/jbig/Makefile | 6 +++--- converter/other/pamtosvg/Makefile | 4 ++-- converter/other/pnmtopalm/Makefile | 8 ++++---- converter/pbm/pbmtoppa/Makefile | 4 ++-- converter/ppm/ppmtompeg/Makefile | 8 ++++---- doc/HISTORY | 13 ++++++++---- other/Makefile | 5 ++--- other/pamx/Makefile | 4 ++-- 11 files changed, 53 insertions(+), 49 deletions(-) diff --git a/converter/other/Makefile b/converter/other/Makefile index 5c5ca30d..61272ab0 100644 --- a/converter/other/Makefile +++ b/converter/other/Makefile @@ -146,8 +146,8 @@ LIBOPTS_TIFF = $(shell $(LIBOPT) $(NETPBMLIB) \ $(LIBOPTR) $(TIFFLIB) $(TIFFLIB_EXTRALIBS)) tifftopnm pamtotiff pnmtotiffcmyk: %: %.o tiff.o $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $@.o tiff.o \ - $(LIBOPTS_TIFF) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) + $(LD) -o $@ $@.o tiff.o \ + $(LIBOPTS_TIFF) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) ifeq ($(shell libpng-config --version),) PNGLIB_LIBOPTS = $(shell $(LIBOPT) $(LIBOPTR) $(PNGLIB) $(ZLIB)) @@ -156,34 +156,34 @@ else endif pngtopnm pngtopam: %: %.o $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $@.o \ + $(LD) -o $@ $@.o \ $(shell $(LIBOPT) $(NETPBMLIB)) \ - $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) + $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) pnmtopng: %: %.o pngtxt.o $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $@.o pngtxt.o \ + $(LD) -o $@ $@.o pngtxt.o \ $(shell $(LIBOPT) $(NETPBMLIB)) \ - $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) + $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) pamrgbatopng: %: %.o $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $@.o \ + $(LD) -o $@ $@.o \ $(shell $(LIBOPT) $(NETPBMLIB)) $(PNGLIB_LIBOPTS) \ - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) + $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) jpegtopnm: %: %.o jpegdatasource.o exif.o $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $< jpegdatasource.o exif.o \ + $(LD) -o $@ $< jpegdatasource.o exif.o \ $(shell $(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(JPEGLIB)) \ - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) + $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) pnmtojpeg: %: %.o $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $@.o \ + $(LD) -o $@ $@.o \ $(shell $(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(JPEGLIB)) \ - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) + $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) svgtopam: %: %.o $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $@.o \ + $(LD) -o $@ $@.o \ $(shell $(LIBOPT) $(NETPBMLIB) $(LIBOPTR)) \ - $(XML2_LIBS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) + $(XML2_LIBS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) # If URTLIB is BUNDLED_URTLIB, then we're responsible for building it, which # means it needs to be a dependency: @@ -192,19 +192,19 @@ ifeq ($(URTLIB), $(BUNDLED_URTLIB)) endif rletopnm pnmtorle: %: %.o $(NETPBMLIB) $(URTLIBDEP) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $@.o \ + $(LD) -o $@ $@.o \ $(shell $(LIBOPT) $(URTLIB) $(NETPBMLIB)) \ - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) + $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) pnmtops: %: %.o bmepsoe.o $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $@.o bmepsoe.o \ + $(LD) -o $@ $@.o bmepsoe.o \ $(shell $(LIBOPT) $(NETPBMLIB) $(ZLIB)) \ - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) + $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) pnmtorast rasttopnm: %: %.o rast.o $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $@.o rast.o \ + $(LD) -o $@ $@.o rast.o \ $(shell $(LIBOPT) $(NETPBMLIB)) \ - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) + $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) bmptopnm.o bmptopnm.o2: bmp.h diff --git a/converter/other/cameratopam/Makefile b/converter/other/cameratopam/Makefile index c997ab33..20a95aa2 100644 --- a/converter/other/cameratopam/Makefile +++ b/converter/other/cameratopam/Makefile @@ -31,8 +31,8 @@ SCRIPTS = include $(SRCDIR)/common.mk cameratopam: $(OBJECTS) $(NETPBMLIB) $(LIBOPT) - $(LD) -o $@ $(LDFLAGS) \ + $(LD) -o $@ \ $(OBJECTS) $(shell $(LIBOPT) $(NETPBMLIB) $(LIBOPTR)) \ - $(MATHLIB) $(LDLIBS) \ + $(MATHLIB) $(LDFLAGS) $(LDLIBS) \ $(RPATH) $(LADD) diff --git a/converter/other/fiasco/Makefile b/converter/other/fiasco/Makefile index 490bd935..16221d77 100644 --- a/converter/other/fiasco/Makefile +++ b/converter/other/fiasco/Makefile @@ -36,9 +36,9 @@ include $(SRCDIR)/common.mk $(BINARIES):%:%.o $(COMMON_OBJECTS) $(FIASCOLIBS) $(NETPBMLIB) \ $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $< $(COMMON_OBJECTS) \ - $(shell $(LIBOPT) $(FIASCOLIBS) $(NETPBMLIB)) $(MATHLIB) $(LDLIBS) \ - $(RPATH) $(LADD) + $(LD) -o $@ $< $(COMMON_OBJECTS) \ + $(shell $(LIBOPT) $(FIASCOLIBS) $(NETPBMLIB)) $(MATHLIB) \ + $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) codec/libfiasco_codec.a: $(BUILDDIR)/$(SUBDIR)/codec FORCE $(MAKE) -C codec -f $(SRCDIR)/$(SUBDIR)/codec/Makefile \ diff --git a/converter/other/jbig/Makefile b/converter/other/jbig/Makefile index 0c079dfe..b5f4e14a 100644 --- a/converter/other/jbig/Makefile +++ b/converter/other/jbig/Makefile @@ -36,9 +36,9 @@ all: $(BINARIES) include $(SRCDIR)/common.mk $(BINARIES): %: %.o $(JBIGLIB_DEP) $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $< \ - $(shell $(LIBOPT) $(NETPBMLIB) $(JBIGLIB)) $(MATHLIB) $(LDLIBS) \ - $(RPATH) $(LADD) + $(LD) -o $@ $< \ + $(shell $(LIBOPT) $(NETPBMLIB) $(JBIGLIB)) $(MATHLIB) \ + $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) $(BUILDDIR)/$(SUBDIR)/libjbig.a: $(LIBJBIG_OBJECTS) diff --git a/converter/other/pamtosvg/Makefile b/converter/other/pamtosvg/Makefile index 8b382f0f..8b033020 100644 --- a/converter/other/pamtosvg/Makefile +++ b/converter/other/pamtosvg/Makefile @@ -50,6 +50,6 @@ all: $(BINARIES) include $(SRCDIR)/common.mk pamtosvg: $(PAMTOSVG_OBJECTS) $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $(PAMTOSVG_OBJECTS) \ + $(LD) -o $@ $(PAMTOSVG_OBJECTS) \ $(shell $(LIBOPT) $(NETPBMLIB)) \ - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) + $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) diff --git a/converter/other/pnmtopalm/Makefile b/converter/other/pnmtopalm/Makefile index 88fea049..7f99f95a 100644 --- a/converter/other/pnmtopalm/Makefile +++ b/converter/other/pnmtopalm/Makefile @@ -21,13 +21,13 @@ include $(SRCDIR)/common.mk LIBOPTS = $(shell $(LIBOPT) $(NETPBMLIB)) $(BINARIES): %: %.o palmcolormap.o $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $< palmcolormap.o $(LIBOPTS) \ - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) + $(LD) -o $@ $< palmcolormap.o $(LIBOPTS) \ + $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) gen_palm_colormap : % : %.c palmcolormap.o - $(CC) -I importinc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \ + $(CC) -I importinc $(CPPFLAGS) $(CFLAGS) -o $@ \ $< palmcolormap.o \ - $(LIBOPTS) $(MATHLIB) $(LDLIBS) $(LADD) + $(LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(LADD) clean: cleanspecial diff --git a/converter/pbm/pbmtoppa/Makefile b/converter/pbm/pbmtoppa/Makefile index 742d4904..5f205230 100644 --- a/converter/pbm/pbmtoppa/Makefile +++ b/converter/pbm/pbmtoppa/Makefile @@ -19,7 +19,7 @@ MERGE_OBJECTS = pbmtoppa.o2 ppa.o pbm.o cutswath.o include $(SRCDIR)/common.mk pbmtoppa: $(OBJECTS) $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) -o pbmtoppa $(OBJECTS) \ - -lm $(shell $(LIBOPT) $(NETPBMLIB)) $(LDLIBS) \ + $(LD) -o pbmtoppa $(OBJECTS) \ + -lm $(shell $(LIBOPT) $(NETPBMLIB)) $(LDFLAGS) $(LDLIBS) \ $(RPATH) $(LADD) diff --git a/converter/ppm/ppmtompeg/Makefile b/converter/ppm/ppmtompeg/Makefile index d8903516..d3342c9a 100644 --- a/converter/ppm/ppmtompeg/Makefile +++ b/converter/ppm/ppmtompeg/Makefile @@ -85,15 +85,15 @@ else endif ppmtompeg: $(OBJECTS) $(NETPBMLIB) $(LIBOPT) - $(LD) -o $@ $(LDFLAGS) \ + $(LD) -o $@ \ $(OBJECTS) $(shell $(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(JPEGLIBX)) \ - $(NETWORKLD) $(MATHLIB) $(LDLIBS) \ + $(NETWORKLD) $(MATHLIB) $(LDFLAGS) $(LDLIBS) \ $(RPATH) $(LADD) profile: $(OBJECTS) $(NETPBMLIB) $(LIBOPT) - $(LD) -o $@ -Bstatic -pg $(LDFLAGS) \ + $(LD) -o $@ -Bstatic -pg \ $(OBJECTS) $(shell $(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(JPEGLIBX)) \ - $(NETWORKLD) $(MATHLIB) $(LDLIBS) \ + $(NETWORKLD) $(MATHLIB) $(LDFLAGS) $(LDLIBS) \ $(RPATH) $(LADD) diff --git a/doc/HISTORY b/doc/HISTORY index 53a1a8e9..189213cc 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -10,16 +10,21 @@ not yet BJH Release 10.45.00 ppmtobmp: Add -mapfile option. - pnm_createBlackTuple(): fix array bounds violation with + pnm_createBlackTuple(): Fix array bounds violation with PBM, PGM. - pnmtoddif: fix crash with any PGM input. + pnmtoddif: Fix crash with any PGM input. - pgmnoise: fix bug: never generates full white pixel. + pgmnoise: Fix bug: never generates full white pixel. pamditherbw: Fix -value other than .5 with -fs, -atkinson. - Build: rename Makefile.common, Makefile.config, to common.mk, + Build: Move LDFLAGS later so that a -L in LDFLAGS doesn't + interfere with finding the built libnetpbm. (The common + link rule is already this way in 10.44.00; all the other + link rules are now the same). + + Build: Rename Makefile.common, Makefile.config, to common.mk, etc. 08.09.27 BJH Release 10.44.00 diff --git a/other/Makefile b/other/Makefile index dc55f773..a6748347 100644 --- a/other/Makefile +++ b/other/Makefile @@ -51,10 +51,9 @@ all: $(BINARIES) $(SUBDIRS:%=%/all) include $(SRCDIR)/common.mk ppmsvgalib: %: %.o $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $< \ + $(LD) -o $@ $< \ $(shell $(LIBOPT) $(NETPBMLIB) $(LINUXSVGALIB)) \ - $(MATHLIB) $(LDLIBS) \ - $(LADD) + $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(LADD) install.bin: install.bin.local .PHONY: install.bin.local diff --git a/other/pamx/Makefile b/other/pamx/Makefile index 04a019e8..a40ea3a6 100644 --- a/other/pamx/Makefile +++ b/other/pamx/Makefile @@ -40,6 +40,6 @@ all: $(BINARIES) include $(SRCDIR)/common.mk pamx: $(PAMX_OBJECTS) $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $(PAMX_OBJECTS) \ + $(LD) -o $@ $(PAMX_OBJECTS) \ $(shell $(LIBOPT) $(NETPBMLIB) $(X11LIB)) \ - $(LDLIBS) $(MATHLIB) $(RPATH) $(LADD) + $(LDFLAGS) $(LDLIBS) $(MATHLIB) $(RPATH) $(LADD) -- cgit 1.4.1