From a24b08a42a02aad4c337f0e5253cb30dc232d15a Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 19 May 2009 13:08:48 -0500 Subject: [PATCH] Rename contrib/pngminim/*/makefile.std to makefile since there's only one makefile, so users can just type "make" instead of "make -f makefile.std". --- contrib/pngminim/decoder/README | 3 +- contrib/pngminim/decoder/makefile.std | 44 -------------------- contrib/pngminim/encoder/README | 3 +- contrib/pngminim/encoder/makefile.std | 43 ------------------- contrib/pngminim/preader/README | 7 ++-- contrib/pngminim/preader/makefile.std | 60 --------------------------- 6 files changed, 8 insertions(+), 152 deletions(-) delete mode 100644 contrib/pngminim/decoder/makefile.std delete mode 100644 contrib/pngminim/encoder/makefile.std delete mode 100644 contrib/pngminim/preader/makefile.std diff --git a/contrib/pngminim/decoder/README b/contrib/pngminim/decoder/README index 4f71082e4..981b60b1f 100644 --- a/contrib/pngminim/decoder/README +++ b/contrib/pngminim/decoder/README @@ -1,6 +1,7 @@ This demonstrates the use of PNG_USER_CONFIG and pngusr.h To build a minimal read-only decoder, run + gather.sh # to collect needed files from pngminus, libpng, and zlib - make -f makefile.std + make diff --git a/contrib/pngminim/decoder/makefile.std b/contrib/pngminim/decoder/makefile.std deleted file mode 100644 index 27e04cbde..000000000 --- a/contrib/pngminim/decoder/makefile.std +++ /dev/null @@ -1,44 +0,0 @@ -# Makefile for PngMinus (pngm2pnm) -# Linux / Unix - -#CC=cc -CC=gcc -LD=$(CC) - -RM=rm -f - -CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \ - -DdeflateParams\(a,b,c\)=Z_OK -I. -O1 - -C=.c -O=.o -L=.a -E= - -ZOBJS = adler32$(O) crc32$(O) gzio$(O) \ - infback$(O) inffast$(O) inflate$(O) inftrees$(O) \ - trees$(O) uncompr$(O) zutil$(O) - -OBJS = pngm2pnm$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \ - pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \ - pngset$(O) pngtrans$(O) $(ZOBJS) - -# implicit make rules ------------------------------------------------------- - -.c$(O): png.h pngconf.h pngusr.h zlib.h - $(CC) -c $(CFLAGS) $< - -# dependencies - -all: pngm2pnm$(E) - -pngm2pnm$(E): $(OBJS) - $(LD) -o pngm2pnm$(E) $(OBJS) - strip pngm2pnm$(E) - -clean: - $(RM) pngm2pnm$(O) - $(RM) pngm2pnm$(E) - $(RM) $(OBJS) - -# End of makefile for pngm2pnm diff --git a/contrib/pngminim/encoder/README b/contrib/pngminim/encoder/README index 4a68fc895..3a44f13b1 100644 --- a/contrib/pngminim/encoder/README +++ b/contrib/pngminim/encoder/README @@ -1,6 +1,7 @@ This demonstrates the use of PNG_USER_CONFIG and pngusr.h To build a minimal write-only encoder, run + gather.sh # to collect needed files from pngminus, libpng, and zlib - make -f makefile.std + make diff --git a/contrib/pngminim/encoder/makefile.std b/contrib/pngminim/encoder/makefile.std deleted file mode 100644 index 1182b5b23..000000000 --- a/contrib/pngminim/encoder/makefile.std +++ /dev/null @@ -1,43 +0,0 @@ -# Makefile for PngMinus (pnm2pngm) -# Linux / Unix - -#CC=cc -CC=gcc -LD=$(CC) - -RM=rm -f - -CFLAGS=-DPNG_USER_CONFIG -DNO_GZIP -I. -O1 - -C=.c -O=.o -L=.a -E= - -ZOBJS = adler32$(O) compress$(O) crc32$(O) deflate$(O) gzio$(O) \ - dummy_inflate$(O) \ - trees$(O) uncompr$(O) zutil$(O) - -OBJS = pnm2pngm$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \ - pngset$(O) pngtrans$(O) pngwio$(O) pngwrite$(O) \ - pngwtran$(O) pngwutil$(O) $(ZOBJS) - -# implicit make rules ------------------------------------------------------- - -.c$(O): png.h pngconf.h pngusr.h zlib.h - $(CC) -c $(CFLAGS) $< - -# dependencies - -all: pnm2pngm$(E) - -pnm2pngm$(E): $(OBJS) - $(LD) -o pnm2pngm$(E) $(OBJS) - strip pnm2pngm$(E) - -clean: - $(RM) pnm2pngm$(O) - $(RM) pnm2pngm$(E) - $(RM) $(OBJS) - -# End of makefile for pnm2pngm diff --git a/contrib/pngminim/preader/README b/contrib/pngminim/preader/README index 8a649a1b1..33239dd0e 100644 --- a/contrib/pngminim/preader/README +++ b/contrib/pngminim/preader/README @@ -1,10 +1,11 @@ This demonstrates the use of PNG_USER_CONFIG and pngusr.h To build a minimal read-only progressive decoder with X display, run -gather.sh to collect needed files from gregbook, libpng, and zlib -Edit makefile.std if required, to find your X library and include files, + gather.sh # to collect needed files from gregbook, libpng, and zlib + +Edit makefile if required, to find your X library and include files, then - make -f makefile.std + make diff --git a/contrib/pngminim/preader/makefile.std b/contrib/pngminim/preader/makefile.std deleted file mode 100644 index 74a17a38f..000000000 --- a/contrib/pngminim/preader/makefile.std +++ /dev/null @@ -1,60 +0,0 @@ -# Makefile for PngMinus (rpng2) -# Linux / Unix - -#CC=cc -CC=gcc -LD=$(CC) - -RM=rm -f - -#XINC = -I/usr/include # old-style, stock X distributions -#XLIB = -L/usr/lib/X11 -lX11 # (including SGI IRIX) - -#XINC = -I/usr/openwin/include # Sun workstations (OpenWindows) -#XLIB = -L/usr/openwin/lib -lX11 - -XINC = -I/usr/X11R6/include # new X distributions (X.org, etc.) -XLIB = -L/usr/X11R6/lib -lX11 -#XLIB = -L/usr/X11R6/lib64 -lX11 # e.g., Red Hat on AMD64 - -#XINC = -I/usr/local/include # FreeBSD -#XLIB = -L/usr/local/lib -lX11 - -#LIBS = $(XLIB) -LIBS = $(XLIB) -lm #platforms that need libm - -CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \ - -DdeflateParams\(a,b,c\)=Z_OK -I. $(XINC) -O1 - -C=.c -O=.o -L=.a -E= - -ZOBJS = adler32$(O) crc32$(O) gzio$(O) \ - infback$(O) inffast$(O) inflate$(O) inftrees$(O) \ - trees$(O) uncompr$(O) zutil$(O) - -OBJS = rpng2-x$(O) readpng2$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \ - pngpread$(O) pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \ - pngset$(O) pngtrans$(O) $(ZOBJS) - -# implicit make rules ------------------------------------------------------- - -.c$(O): png.h pngconf.h readpng2.h pngusr.h zlib.h - $(CC) -c $(CFLAGS) $< - -# dependencies - -all: rpng2-x$(E) - -rpng2-x$(E): $(OBJS) - $(LD) -o rpng2-x$(E) $(OBJS) $(LIBS) - strip rpng2-x$(E) - -clean: - $(RM) rpng2-x$(O) - $(RM) rpng2-x$(E) - $(RM) $(OBJS) - -# End of makefile for rpng2-x