diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-07-11 17:36:18 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-07-11 17:36:18 -0500 |
commit | 340c9b237baeb9dc401ff842a3ef917fc55892fa (patch) | |
tree | 2728ae6b679e307dc58c31561bb045eda6aa49c8 /contrib | |
parent | fb2bd00859c7b9847b8be43f4d2fc38aa55d047f (diff) | |
download | libpng-340c9b237baeb9dc401ff842a3ef917fc55892fa.tar.gz |
[master] Updated contrib/pngminus/makefile.std
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/pngminus/makefile.std | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/contrib/pngminus/makefile.std b/contrib/pngminus/makefile.std index 2fb061bbe..e03b0f95e 100644 --- a/contrib/pngminus/makefile.std +++ b/contrib/pngminus/makefile.std @@ -1,16 +1,16 @@ # Makefile for PngMinus (png2pnm and pnm2png) # Linux / Unix -#CC=cc -CC=gcc -LD=$(CC) +#CC?=cc +CC?=gcc +LD?=$(CC) RM=rm -f #PNGPATH = /usr/local -#PNGINC = -I$(PNGPATH)/include/libpng12 -#PNGLIB = -L$(PNGPATH)/lib -lpng12 -#PNGLIBS = $(PNGPATH)/lib/libpng12.a +#PNGINC = -I$(PNGPATH)/include/libpng14 +#PNGLIB = -L$(PNGPATH)/lib -lpng14 +#PNGLIBS = $(PNGPATH)/lib/libpng14.a PNGINC = -I../.. PNGLIB = -L../.. -lpng PNGLIBS = ../../libpng.a @@ -23,9 +23,9 @@ ZINC = -I../../../zlib ZLIB = -L../../../zlib -lz ZLIBS = ../../../zlib/libz.a -CFLAGS=-O3 $(PNGINC) $(ZINC) -LDFLAGS=$(PNGLIB) $(ZLIB) -LDFLAGSS=$(PNGLIBS) $(ZLIBS) +CFLAGS+=$(PNGINC) $(ZINC) +LDLIBS=$(PNGLIB) $(ZLIB) +LDLIBSS=$(PNGLIBS) $(ZLIBS) C=.c O=.o L=.a @@ -40,19 +40,19 @@ png2pnm$(O): png2pnm$(C) $(CC) -c $(CFLAGS) png2pnm$(C) png2pnm$(E): png2pnm$(O) - $(LD) -o png2pnm$(E) png2pnm$(O) $(LDFLAGS) -lm + $(LD) $(LDFLAGS) -o png2pnm$(E) png2pnm$(O) $(LDLIBS) -lm png2pnm-static$(E): png2pnm$(O) - $(LD) -o png2pnm-static$(E) png2pnm$(O) $(LDFLAGSS) -lm + $(LD) $(LDFLAGS) -o png2pnm-static$(E) png2pnm$(O) $(LDLIBSS) -lm pnm2png$(O): pnm2png$(C) $(CC) -c $(CFLAGS) pnm2png$(C) pnm2png$(E): pnm2png$(O) - $(LD) -o pnm2png$(E) pnm2png$(O) $(LDFLAGS) -lm + $(LD) $(LDFLAGS) -o pnm2png$(E) pnm2png$(O) $(LDLIBS) -lm pnm2png-static$(E): pnm2png$(O) - $(LD) -o pnm2png-static$(E) pnm2png$(O) $(LDFLAGSS) -lm + $(LD) $(LDFLAGS) -o pnm2png-static$(E) pnm2png$(O) $(LDLIBSS) -lm clean: $(RM) png2pnm$(O) |