diff options
Diffstat (limited to 'graphics/netpbm/files/patch-lib-Makefile')
| -rw-r--r-- | graphics/netpbm/files/patch-lib-Makefile | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/graphics/netpbm/files/patch-lib-Makefile b/graphics/netpbm/files/patch-lib-Makefile index a523767f3c46..4ed3dec176b2 100644 --- a/graphics/netpbm/files/patch-lib-Makefile +++ b/graphics/netpbm/files/patch-lib-Makefile @@ -1,17 +1,17 @@ ---- lib/Makefile.orig 2007-12-13 17:23:52.000000000 +0100 -+++ lib/Makefile 2008-01-13 16:43:41.000000000 +0100 -@@ -35,6 +35,8 @@ +--- lib/Makefile.orig 2009-09-18 21:04:37.000000000 +0200 ++++ lib/Makefile 2010-05-21 10:36:08.000000000 +0200 +@@ -42,6 +42,8 @@ # Library objects to be linked but not built by Makefile.common: - LIBOBJECTS_X = util/shhopt.o util/nstring.o + LIBOBJECTS_X = util/shhopt.o util/nstring.o util/filename.o +SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS)) + MANUALS3 = libnetpbm MANUALS5 = pbm pgm ppm pnm pam -@@ -76,13 +78,17 @@ +@@ -80,13 +82,17 @@ - $(LIBOBJECTS): %.o: %.c $(HEADERLINKS) + $(LIBOBJECTS): %.o: %.c importinc # Note that the user may have configured -I options into CFLAGS. + $(CC) -c $(INCLUDES) -DNDEBUG $(CFLAGS) \ + $(CFLAGS_PERSONAL) $(CADD) -o $@ $< @@ -28,7 +28,7 @@ ifeq ($(NETPBMLIBTYPE),irixshared) # The libxxx.so link is needed to link the executables. -@@ -107,12 +113,9 @@ +@@ -113,11 +119,8 @@ # The $(SONAME) link is needed only to test the programs without # installing the libraries (in that case, you also need to direct the # dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH). @@ -37,14 +37,12 @@ - $(SYMLINK) $< $@ -libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) - $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ -- $(SHLIB_CLIB) -lm $(LADD) +$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X) + $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \ -+ $(SHLIB_CLIB) $(MATHLIB) $(LADD) + $(SHLIB_CLIB) -lm $(LADD) endif - ifeq ($(NETPBMLIBTYPE),dll) -@@ -189,13 +192,10 @@ +@@ -205,13 +208,10 @@ .PHONY: install.lib ifeq ($(NETPBMLIBTYPE),unixshared) # install a Unix-style shared library @@ -62,7 +60,7 @@ endif ifeq ($(NETPBMLIBTYPE),dll) #install a Windows DLL shared library -@@ -225,23 +225,23 @@ +@@ -241,23 +241,23 @@ # directory when you compile your programs. %_installhdr: $(PKGDIR)/include |