From 86e28372bb9b28a8d62c33c874f395bbbcd395cf Mon Sep 17 00:00:00 2001 From: giraffedata Date: Sun, 7 Dec 2008 01:58:20 +0000 Subject: Release 10.35.57 git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@788 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- Makefile.config.in | 2 +- Makefile.version | 2 +- analyzer/pamtilt.c | 2 + buildtools/configure.pl | 63 ++++++++++++---------- converter/other/Makefile | 40 +++++++------- converter/other/cameratopam/Makefile | 4 +- converter/other/fiasco/Makefile | 6 +-- converter/other/jbig/Makefile | 6 +-- converter/other/jpeg2000/Makefile | 5 +- converter/other/jpeg2000/libjasper/Makefile.common | 2 +- converter/other/pamtosvg/Makefile | 4 +- converter/other/pnmtopalm/Makefile | 8 +-- converter/other/svgtopam.c | 1 + converter/pbm/pbmtoppa/Makefile | 4 +- converter/ppm/ppmtompeg/Makefile | 8 +-- doc/HISTORY | 27 ++++++++-- editor/ppmcolormask.c | 1 + other/Makefile | 5 +- other/pamx/Makefile | 4 +- other/pamx/pamx.c | 1 + 20 files changed, 113 insertions(+), 82 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index 84666cb1..a983047a 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -281,7 +281,7 @@ LDRELOC = NONE # know why -- history seems to be repeating itself. 2005.02.23. CFLAGS_SHLIB = -# Solaris or SunOS with gcc, and NetBSD: +# Gcc: #CFLAGS_SHLIB = -fpic #CFLAGS_SHLIB = -fPIC # Sun compiler: diff --git a/Makefile.version b/Makefile.version index cd924631..b78b698a 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 35 -NETPBM_POINT_RELEASE = 55 +NETPBM_POINT_RELEASE = 57 diff --git a/analyzer/pamtilt.c b/analyzer/pamtilt.c index 37b6c394..2aa65df8 100644 --- a/analyzer/pamtilt.c +++ b/analyzer/pamtilt.c @@ -10,6 +10,8 @@ All work has been contributed to the public domain by its authors. =============================================================================*/ +#define _XOPEN_SOURCE /* get M_PI in math.h */ + #include #include diff --git a/buildtools/configure.pl b/buildtools/configure.pl index b7f231af..89eccc61 100755 --- a/buildtools/configure.pl +++ b/buildtools/configure.pl @@ -145,22 +145,14 @@ sub chooseTestCompiler($$) { my $cc; - if (!defined($compiler)) { - if ($ENV{'CC'}) { - $cc = $ENV{'CC'}; - } else { - if (commandExists('cc')) { - $cc = 'cc'; - } elsif (commandExists("gcc")) { - $cc = 'gcc'; - } - } - } elsif ($compiler eq 'cc') { - $cc = "cc"; - } elsif ($compiler eq 'gcc') { - $cc = 'gcc'; + if ($ENV{'CC'}) { + $cc = $ENV{'CC'}; } else { - die("Internal error: invalid value \"$compiler\" for \$compiler"); + if (commandExists('cc')) { + $cc = 'cc'; + } elsif (commandExists("gcc")) { + $cc = 'gcc'; + } } $$testCcR = $cc; } @@ -431,7 +423,8 @@ sub getCompiler($$) { # need different options. # # - There are basically two choices on any system: native compiler or -# GNU compiler. That's all this program recognizes, anyway. +# GNU compiler. That's all this program recognizes, anyway. On some, +# native _is_ GNU, and we return 'gcc'. # # - A user may well have various compilers. Different releases, using # different standard libraries, for different target machines, etc. @@ -450,15 +443,24 @@ sub getCompiler($$) { # # The value this subroutine returns is NOT the command name to invoke the # compiler. It is simply "cc" to mean native compiler or "gcc" to mean -# GNU compiler or undefined to express no preference. +# GNU compiler. #----------------------------------------------------------------------------- - my %gccCapablePlatform = ("SOLARIS" => 1, - "TRU64" => 1, - "SCO" => 1, - "AIX" => 1, - "HP" => 1); - - if ($gccCapablePlatform{$platform}) { + my %gccOptionalPlatform = ("SOLARIS" => 1, + "TRU64" => 1, + "SCO" => 1, + "AIX" => 1, + "HP" => 1); + + my %gccUsualPlatform = ("GNU" => 1, + "NETBSD" => 1, + "OPENBSD" => 1, + "FREEBSD" => 1, + "DARWIN" => 1, + ); + + if ($gccUsualPlatform{$platform}) { + $$compilerR = "gcc"; + } elsif ($gccOptionalPlatform{$platform}) { print("GNU compiler or native operating system compiler (cc)?\n"); print("\n"); @@ -491,6 +493,8 @@ sub getCompiler($$) { "makefile variable or install 'gcc'\n"); } print("\n"); + } else { + $$compilerR = 'cc'; } } @@ -1949,8 +1953,6 @@ if ($platform eq "GNU") { '-shared -Wl,--image-base=0x10000000 -Wl,--enable-auto-import', "\n"); } elsif ($platform eq "BEOS") { push(@Makefile_config, "LDSHLIB = -nostart\n"); -} elsif ($platform eq "NETBSD") { - push(@Makefile_config, 'CFLAGS_SHLIB = -fpic', "\n"); } elsif ($platform eq "OPENBSD") { # vedge@vedge.com.ar says on 2001.04.29 that there are a ton of # undefined symbols in the Fiasco stuff on OpenBSD. So we'll just @@ -1967,13 +1969,12 @@ if ($platform eq "GNU") { if ($compiler eq "cc") { push(@Makefile_config, "CFLAGS = -O\n"); push(@Makefile_config, "CFLAGS_SHLIB = -O -K pic\n"); - push(@Makefile_config, "LD_SHLIB = -G\n"); + push(@Makefile_config, "LDSHLIB = -G\n"); push(@Makefile_config, "SHLIB_CLIB =\n"); } else { makeCompilerGcc(\@Makefile_config); + push(@Makefile_config, "LDSHLIB = -shared\n"); } - push(@Makefile_config, "CFLAGS_SHLIB = -fPIC\n"); - push(@Makefile_config, "LDSHLIB = -shared\n"); push(@Makefile_config, "NETWORKLD = -lsocket -lresolve\n"); } elsif ($platform eq "DARWIN") { push(@Makefile_config, "CC = cc -no-cpp-precomp\n"); @@ -2027,6 +2028,10 @@ if (!$flex_result) { } } +if ($compiler eq 'gcc') { + push(@Makefile_config, "CFLAGS_SHLIB += -fPIC\n"); +} + if (defined($tiffhdr_dir)) { push(@Makefile_config, "TIFFHDR_DIR = $tiffhdr_dir\n"); } diff --git a/converter/other/Makefile b/converter/other/Makefile index 4585c45d..81e1da14 100644 --- a/converter/other/Makefile +++ b/converter/other/Makefile @@ -142,8 +142,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)) @@ -152,34 +152,34 @@ else endif pngtopnm: %: %.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: @@ -188,19 +188,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 c50c9176..b6778c67 100644 --- a/converter/other/cameratopam/Makefile +++ b/converter/other/cameratopam/Makefile @@ -30,8 +30,8 @@ SCRIPTS = include $(SRCDIR)/Makefile.common 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 0dd945ed..9f7310bd 100644 --- a/converter/other/fiasco/Makefile +++ b/converter/other/fiasco/Makefile @@ -36,9 +36,9 @@ include $(SRCDIR)/Makefile.common $(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 ca98ef29..1b9d7535 100644 --- a/converter/other/jbig/Makefile +++ b/converter/other/jbig/Makefile @@ -36,9 +36,9 @@ all: $(BINARIES) include $(SRCDIR)/Makefile.common $(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/jpeg2000/Makefile b/converter/other/jpeg2000/Makefile index 528c5ab8..bf3f5e4a 100644 --- a/converter/other/jpeg2000/Makefile +++ b/converter/other/jpeg2000/Makefile @@ -60,8 +60,9 @@ include $(SRCDIR)/Makefile.common LIBOPTS = $(shell $(LIBOPT) $(NETPBMLIB) $(JASPERLIB_USE)) $(BINARIES): %: %.o $(JASPERLIB_DEP) $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) $(MATHLIB) $(LDLIBS) -o $@ $< \ - $(LIBOPTS) $(JASPERDEPLIBS) -lm $(RPATH) $(LADD) + $(LD) -o $@ $< \ + $(LIBOPTS) $(JASPERDEPLIBS) $(MATHLIB) $(RPATH) \ + $(LDFLAGS) $(LDLIBS) $(LADD) $(INTERNAL_JASPERLIB): $(BUILDDIR)/$(SUBDIR)/libjasper FORCE $(MAKE) -f $(SRCDIR)/$(SUBDIR)/libjasper/Makefile \ diff --git a/converter/other/jpeg2000/libjasper/Makefile.common b/converter/other/jpeg2000/libjasper/Makefile.common index 56bcea0d..525e9c2d 100644 --- a/converter/other/jpeg2000/libjasper/Makefile.common +++ b/converter/other/jpeg2000/libjasper/Makefile.common @@ -26,7 +26,7 @@ include $(SRCDIR)/Makefile.common DEFS = -DHAVE_LIBM=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STDDEF_H=1 -DEXCLUDE_BMP_SUPPORT -DEXCLUDE_RAS_SUPPORT -DEXCLUDE_MIF_SUPPORT -DEXCLUDE_JPG_SUPPORT -DEXCLUDE_PGX_SUPPORT -DEXCLUDE_PNM_SUPPORT $(LIB_OBJECTS):%.o:%.c - $(CC) -c $(CFLAGS) $(INCLUDES) $(DEFS) $(CADD) $< + $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(CADD) $< $(LIB_OBJECTS): importinc diff --git a/converter/other/pamtosvg/Makefile b/converter/other/pamtosvg/Makefile index 7f9c3e30..ba03fd68 100644 --- a/converter/other/pamtosvg/Makefile +++ b/converter/other/pamtosvg/Makefile @@ -50,6 +50,6 @@ all: $(BINARIES) include $(SRCDIR)/Makefile.common 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 2a76297e..4a8fa02a 100644 --- a/converter/other/pnmtopalm/Makefile +++ b/converter/other/pnmtopalm/Makefile @@ -21,12 +21,12 @@ include $(SRCDIR)/Makefile.common 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 : $(SUBDIR)/gen_palm_colormap.c palmcolormap.o - $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) -o $@ $< palmcolormap.o \ - $(LIBOPTS) $(MATHLIB) $(LDLIBS) $(LADD) + $(CC) $(INCLUDES) $(CFLAGS) -o $@ $< palmcolormap.o \ + $(LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(LADD) clean: cleanspecial diff --git a/converter/other/svgtopam.c b/converter/other/svgtopam.c index 268515ad..a2fe9f9d 100644 --- a/converter/other/svgtopam.c +++ b/converter/other/svgtopam.c @@ -15,6 +15,7 @@ Contributed to the public domain. ============================================================================*/ +#define _BSD_SOURCE /* Make sure strdup() is in */ #include #include #include diff --git a/converter/pbm/pbmtoppa/Makefile b/converter/pbm/pbmtoppa/Makefile index c4be08b7..ba15adaa 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)/Makefile.common 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 5e923fee..4e0ad8d6 100644 --- a/converter/ppm/ppmtompeg/Makefile +++ b/converter/ppm/ppmtompeg/Makefile @@ -70,15 +70,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 a1a7cd88..b44f31ea 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,27 @@ Netpbm. CHANGE HISTORY -------------- +08.12.07 BJH Release 10.35.57 + + Build: Move CFLAGS later in libjasper build so that a -I in + CFLAGS doesn't interfere with finding the local libjasper + header files. + + 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.35.56; all the other + link rules are now the same). + + Build: Add source type declarations to make -ansi compile work. + + Build: Add -fPIC to all Gcc compiles of library modules, so it + works on AMD64, IA64. + +08.11.09 BJH Release 10.35.56 + + Add -fPIC to all Gcc compiles of library modules, so it + works on AMD64, IA64. + 08.10.31 BJH Release 10.35.55 pamcomp: Fix mysterious doubling of code introduced in 10.35.50 @@ -11,16 +32,16 @@ CHANGE HISTORY 08.10.27 BJH Release 10.35.54 - pnm_createBlackTuple(): fix array bounds violation with + pnm_createBlackTuple(): Fix array bounds violation with PBM, PGM. ppmforge, pgmnoise, pgmcrater: better randomization; won't produce the same image if you run it twice within the same second. - 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. 08.10.12 BJH Release 10.35.53 diff --git a/editor/ppmcolormask.c b/editor/ppmcolormask.c index 57e5c825..2829e634 100644 --- a/editor/ppmcolormask.c +++ b/editor/ppmcolormask.c @@ -9,6 +9,7 @@ Contributed to the public domain by its author. =========================================================================*/ +#define _BSD_SOURCE /* Make sure strdup() is in */ #include #include diff --git a/other/Makefile b/other/Makefile index 87f92f96..9aaa9d93 100644 --- a/other/Makefile +++ b/other/Makefile @@ -50,10 +50,9 @@ all: $(BINARIES) $(SUBDIRS:%=%/all) include $(SRCDIR)/Makefile.common 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 9c3f2cf0..baff506d 100644 --- a/other/pamx/Makefile +++ b/other/pamx/Makefile @@ -39,6 +39,6 @@ all: $(BINARIES) include $(SRCDIR)/Makefile.common 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) diff --git a/other/pamx/pamx.c b/other/pamx/pamx.c index 17980643..5fd525b7 100644 --- a/other/pamx/pamx.c +++ b/other/pamx/pamx.c @@ -3,6 +3,7 @@ Copyright information is in the file COPYRIGHT */ +#define _BSD_SOURCE /* Make sure strdup() is in */ #include #include #include -- cgit 1.4.1