| fcbc54ca |
1 | --- libpng-1.0.14/scripts/makefile.linux.orig Thu Jul 18 22:42:47 2002 |
| 2 | +++ libpng-1.0.14/scripts/makefile.linux Thu Jul 18 22:44:46 2002 |
| 3 | @@ -1,17 +1,17 @@ |
| 4 | -# makefile for libpng.a and libpng10.so on Linux ELF with gcc |
| 5 | +# makefile for libpng.a and libpng.so on Linux ELF with gcc |
| 6 | # Copyright (C) 1998, 1999, 2002 Greg Roelofs and Glenn Randers-Pehrson |
| 7 | # Copyright (C) 1996, 1997 Andreas Dilger |
| 8 | # For conditions of distribution and use, see copyright notice in png.h |
| 9 | |
| 10 | -LIBNAME = libpng10 |
| 11 | -PNGMAJ = 0 |
| 12 | +LIBNAME = libpng |
| 13 | +PNGMAJ = 2 |
| 14 | PNGMIN = 1.0.14 |
| 15 | PNGVER = $(PNGMAJ).$(PNGMIN) |
| 16 | |
| 17 | CC=gcc |
| 18 | |
| 19 | -# where "make install" puts libpng10.a, libpng10.so*, |
| 20 | -# libpng10/png.h and libpng10/pngconf.h |
| 21 | +# where "make install" puts libpng.a, libpng.so*, |
| 22 | +# libpng/png.h and libpng/pngconf.h |
| 23 | # Prefix must be a full pathname. |
| 24 | prefix=/usr/local |
| 25 | |
| 26 | @@ -34,7 +34,7 @@ |
| 27 | CFLAGS= $(OPT_FLAGS) -Wall -funroll-loops \ |
| 28 | $(ALIGN) # $(WARNMORE) -DPNG_DEBUG=5 |
| 29 | |
| 30 | -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng10 -lz -lm |
| 31 | +LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm |
| 32 | LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm |
| 33 | |
| 34 | RANLIB=ranlib |
| 35 | @@ -86,7 +86,7 @@ |
| 36 | echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \ |
| 37 | echo cflags=\"\"; \ |
| 38 | echo ldflags=\"-L$(LIBPATH) -Wl,-rpath,$(LIBPATH)\"; \ |
| 39 | - echo libs=\"-lpng10 -lz -lm\"; \ |
| 40 | + echo libs=\"-lpng -lz -lm\"; \ |
| 41 | cat scripts/libpng-config-body.in ) > libpng-config |
| 42 | chmod +x libpng-config |
| 43 | |
| 44 | @@ -119,26 +119,16 @@ |
| 45 | |
| 46 | install-headers: png.h pngconf.h |
| 47 | -@if [ ! -d $(DI) ]; then mkdir $(DI); fi |
| 48 | - -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi |
| 49 | - cp png.h pngconf.h $(DI)/$(LIBNAME) |
| 50 | - chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h |
| 51 | - -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h |
| 52 | - -@/bin/rm -f $(DI)/libpng |
| 53 | - (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .) |
| 54 | + cp png.h pngconf.h $(DI) |
| 55 | + chmod 644 $(DI)/png.h $(DI)/pngconf.h |
| 56 | |
| 57 | install-static: install-headers libpng.a |
| 58 | -@if [ ! -d $(DL) ]; then mkdir $(DL); fi |
| 59 | cp libpng.a $(DL)/$(LIBNAME).a |
| 60 | chmod 644 $(DL)/$(LIBNAME).a |
| 61 | - -@/bin/rm -f $(DL)/libpng.a |
| 62 | - (cd $(DL); ln -sf $(LIBNAME).a libpng.a) |
| 63 | |
| 64 | install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc |
| 65 | -@if [ ! -d $(DL) ]; then mkdir $(DL); fi |
| 66 | - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so |
| 67 | - -@/bin/rm -f $(DL)/libpng.so |
| 68 | - -@/bin/rm -f $(DL)/libpng.so.2 |
| 69 | - -@/bin/rm -f $(DL)/libpng.so.2.* |
| 70 | cp $(LIBNAME).so.$(PNGVER) $(DL) |
| 71 | chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) |
| 72 | (cd $(DL); \ |
| 73 | @@ -148,30 +138,21 @@ |
| 74 | ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ |
| 75 | ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) |
| 76 | -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi |
| 77 | - -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc |
| 78 | - -@/bin/rm -f $(DL)/pkgconfig/libpng.pc |
| 79 | cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc |
| 80 | chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc |
| 81 | - (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc) |
| 82 | |
| 83 | install-man: libpng.3 libpngpf.3 png.5 |
| 84 | -@if [ ! -d $(DM) ]; then mkdir $(DM); fi |
| 85 | -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi |
| 86 | - -@/bin/rm -f $(DM)/man3/libpng.3 |
| 87 | - -@/bin/rm -f $(DM)/man3/libpngpf.3 |
| 88 | cp libpng.3 $(DM)/man3 |
| 89 | cp libpngpf.3 $(DM)/man3 |
| 90 | -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi |
| 91 | - -@/bin/rm -f $(DM)/man5/png.5 |
| 92 | cp png.5 $(DM)/man5 |
| 93 | |
| 94 | install-config: libpng-config |
| 95 | -@if [ ! -d $(DB) ]; then mkdir $(DB); fi |
| 96 | - -@/bin/rm -f $(DB)/libpng-config |
| 97 | - -@/bin/rm -f $(DB)/$(LIBNAME)-config |
| 98 | cp libpng-config $(DB)/$(LIBNAME)-config |
| 99 | chmod 755 $(DB)/$(LIBNAME)-config |
| 100 | - (cd $(DB); ln -sf $(LIBNAME)-config libpng-config) |
| 101 | |
| 102 | install: install-static install-shared install-man install-config |
| 103 | |
projects / packages / libpng.git / blame