diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2008-12-03 20:00:33 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2008-12-03 20:00:33 +0000 |
commit | dc623704d3b6f4cadd2036c9627f2ac3054b6b0c (patch) | |
tree | d5fd4eb101701f85487f49e7087b5043fbe71bee /converter/other | |
parent | 5fcd32eee038bb0cba85f2bcb70a1b0824cf618a (diff) | |
download | netpbm-mirror-dc623704d3b6f4cadd2036c9627f2ac3054b6b0c.tar.gz netpbm-mirror-dc623704d3b6f4cadd2036c9627f2ac3054b6b0c.tar.xz netpbm-mirror-dc623704d3b6f4cadd2036c9627f2ac3054b6b0c.zip |
Move LDFLAGS later
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@775 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other')
-rw-r--r-- | converter/other/Makefile | 40 | ||||
-rw-r--r-- | converter/other/cameratopam/Makefile | 4 | ||||
-rw-r--r-- | converter/other/fiasco/Makefile | 6 | ||||
-rw-r--r-- | converter/other/jbig/Makefile | 6 | ||||
-rw-r--r-- | converter/other/pamtosvg/Makefile | 4 | ||||
-rw-r--r-- | converter/other/pnmtopalm/Makefile | 8 |
6 files changed, 34 insertions, 34 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 |