diff options
| author | Cosmin Truta <ctruta@gmail.com> | 2014-03-22 11:19:35 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-03-22 11:19:35 -0500 |
| commit | 4904cbce65b977a8106cf10984f6bbb6b69c71bc (patch) | |
| tree | 6fd98b77c3070d7678c040f2fd50522320345e01 /scripts/makefile.dec | |
| parent | d2016be48dde90354c58c6ead88f7b8a53cc560e (diff) | |
| download | libpng-4904cbce65b977a8106cf10984f6bbb6b69c71bc.tar.gz | |
[libpng15] Port recent changes from libpng-1.6.11beta
Silence 'unused parameter' build warnings (Cosmin).
$(CP) is now used alongside $(RM_F). Also, use 'copy' instead
of 'cp' where applicable, and applied other minor makefile changes.
Don't warn about invalid dimensions exceeding user limits.
Diffstat (limited to 'scripts/makefile.dec')
| -rw-r--r-- | scripts/makefile.dec | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 74804289c..489129da1 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -22,6 +22,7 @@ CC=cc MKDIR_P=mkdir LN_SF=ln -f -s RANLIB=ranlib +CP=cp RM_F=/bin/rm -f # where make install puts libpng.a and png.h @@ -68,7 +69,7 @@ all: $(LIBSO) libpng.a pngtest libpng.pc libpng-config # see scripts/pnglibconf.mak for more options pnglibconf.h: scripts/pnglibconf.h.prebuilt - cp scripts/pnglibconf.h.prebuilt $@ + $(CP) $< $@ libpng.a: $(OBJS) $(AR_RC) $@ $(OBJS) @@ -181,7 +182,7 @@ test-installed: ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ + $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ libpng-config $(LIBSO) $(LIBSOMAJ)* \ libpng.pc pnglibconf.h |