diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-01-12 10:44:01 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-01-12 10:49:40 -0600 |
| commit | 4250328102204396076e1a6223b358e98307d640 (patch) | |
| tree | b4f005465d9479e262215f3c5b0979581ddcd6b3 /contrib/pngminus | |
| parent | bb6e0a2db3e04eb70ccdca27efa416e5887ea37a (diff) | |
| download | libpng-4250328102204396076e1a6223b358e98307d640.tar.gz | |
[libpng16] Updated scripts/makefile.* to use CPPFLAGS (Cosmin)
Diffstat (limited to 'contrib/pngminus')
| -rw-r--r-- | contrib/pngminus/makefile.std | 7 | ||||
| -rw-r--r-- | contrib/pngminus/makefile.tc3 | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/contrib/pngminus/makefile.std b/contrib/pngminus/makefile.std index 30317b77d..14e25cd64 100644 --- a/contrib/pngminus/makefile.std +++ b/contrib/pngminus/makefile.std @@ -23,7 +23,8 @@ ZINC = -I../../../zlib ZLIB = -L../../../zlib -lz ZLIBS = ../../../zlib/libz.a -CFLAGS=$(PNGINC) $(ZINC) +CPPFLAGS=$(PNGINC) $(ZINC) +CFLAGS= LDLIBS=$(PNGLIB) $(ZLIB) LDLIBSS=$(PNGLIBS) $(ZLIBS) C=.c @@ -37,7 +38,7 @@ E= all: png2pnm$(E) pnm2png$(E) png2pnm-static$(E) pnm2png-static$(E) png2pnm$(O): png2pnm$(C) - $(CC) -c $(CFLAGS) png2pnm$(C) + $(CC) -c $(CPPFLAGS) $(CFLAGS) png2pnm$(C) png2pnm$(E): png2pnm$(O) $(LD) $(LDFLAGS) -o png2pnm$(E) png2pnm$(O) $(LDLIBS) -lm @@ -46,7 +47,7 @@ png2pnm-static$(E): png2pnm$(O) $(LD) $(LDFLAGS) -o png2pnm-static$(E) png2pnm$(O) $(LDLIBSS) -lm pnm2png$(O): pnm2png$(C) - $(CC) -c $(CFLAGS) pnm2png$(C) + $(CC) -c $(CPPFLAGS) $(CFLAGS) pnm2png$(C) pnm2png$(E): pnm2png$(O) $(LD) $(LDFLAGS) -o pnm2png$(E) pnm2png$(O) $(LDLIBS) -lm diff --git a/contrib/pngminus/makefile.tc3 b/contrib/pngminus/makefile.tc3 index 404f18d5b..6a2f4b985 100644 --- a/contrib/pngminus/makefile.tc3 +++ b/contrib/pngminus/makefile.tc3 @@ -7,7 +7,8 @@ LB=tlib RM=del CP=copy MODEL=l -CCFLAGS=-O -m$(MODEL) -I..\libpng -I..\zlib +CPPFLAGS=-I..\libpng -I..\zlib +CFLAGS=-O -m$(MODEL) LDFLAGS=-m$(MODEL) -L..\libpng -L..\zlib C=.c O=.obj @@ -19,13 +20,13 @@ E=.exe all: png2pnm$(E) pnm2png$(E) png2pnm$(O): png2pnm$(C) - $(CC) -c $(CCFLAGS) png2pnm$(C) + $(CC) -c $(CPPFLAGS) $(CFLAGS) png2pnm$(C) png2pnm$(E): png2pnm$(O) $(LD) $(LDFLAGS) png2pnm$(O) libpng$(L) zlib$(L) pnm2png$(O): pnm2png$(C) - $(CC) -c $(CCFLAGS) pnm2png$(C) + $(CC) -c $(CPPFLAGS) $(CFLAGS) pnm2png$(C) pnm2png$(E): pnm2png$(O) $(LD) $(LDFLAGS) pnm2png$(O) libpng$(L) zlib$(L) @@ -35,4 +36,3 @@ clean: $(RM) *$(E) # End of makefile for png2pnm / pnm2png - |