packages/multimedia/libpng/makefile.linux.patch

   1 --- libpng-1.2.8/scripts/libpng.pc.in.orig      2005-01-04 14:06:54.182100728 +0000
   2 +++ libpng-1.2.8/scripts/libpng.pc.in   2005-01-04 14:07:19.108311368 +0000
   3 @@ -7,5 +7,5 @@
   4  Name: libpng12
   5  Description: Loads and saves PNG files
   6  Version: 1.2.8
   7 -Libs: -L${libdir} -lpng12 -lz -lm
   8 +Libs: -L${libdir} -lpng12
   9  Cflags: -I${includedir}/libpng12
  10 --- libpng-1.2.8/scripts/makefile.linux.orig    2005-01-04 14:07:37.875458328 +0000
  11 +++ libpng-1.2.8/scripts/makefile.linux 2005-01-04 14:11:03.918135080 +0000
  12 @@ -34,8 +34,9 @@
  13  CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
  14         $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
  15
  16 -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
  17 -LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
  18 +LIBS=-lz -lm
  19 +LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12
  20 +LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a $(LIBS)
  21
  22  RANLIB=ranlib
  23  #RANLIB=echo
  24 @@ -86,7 +87,7 @@
  25         echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
  26         echo L_opts=\"-L$(LIBPATH)\"; \
  27         echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
  28 -       echo libs=\"-lpng12 -lz -lm\"; \
  29 +       echo libs=\"-lpng12\"; \
  30         cat scripts/libpng-config-body.in ) > libpng-config
  31         chmod +x libpng-config
  32
  33 @@ -99,12 +100,12 @@
  34  $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
  35         $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
  36         -o $(LIBNAME).so.$(PNGVER) \
  37 -       $(OBJSDLL)
  38 +       $(OBJSDLL) $(LIBS)
  39
  40  libpng.so.3.$(PNGMIN): $(OBJSDLL)
  41         $(CC) -shared -Wl,-soname,libpng.so.3 \
  42         -o libpng.so.3.$(PNGMIN) \
  43 -       $(OBJSDLL)
  44 +       $(OBJSDLL) $(LIBS)
  45
  46  pngtest: pngtest.o $(LIBNAME).so
  47         $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)