mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

scripts: Clean up the logging in makefile.std and pnglibconf.mak

Browse Source 
The console logs produced by these scripts should be easy to follow,
especially on CI bots.

Delete the unnecessary macros ECHO and SED.
Add a new macro MV_F (for "mv -f"), alongside RM_F (for "rm -f").
This commit is contained in:
Cosmin Truta 2022-09-14 11:53:47 +03:00
parent 62c027d4df
commit 8b7b99c1db
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/makefile.std
View File

@ -36,10 +36,9 @@ MKDIR_P = mkdir
LN_SF = ln -sf LN_SF = ln -sf
RANLIB = ranlib RANLIB = ranlib
CP = cp CP = cp
MV_F = mv -f
RM_F = rm -f RM_F = rm -f
AWK = awk AWK = awk
SED = sed
ECHO = echo
DFNFLAGS = # DFNFLAGS contains -D options to use in the libpng build DFNFLAGS = # DFNFLAGS contains -D options to use in the libpng build
DFA_EXTRA = # extra files that can be used to control configuration DFA_EXTRA = # extra files that can be used to control configuration
@ -65,21 +64,21 @@ all: libpng.a pngtest
# copy this if the following doesn't work. # copy this if the following doesn't work.
pnglibconf.h: pnglibconf.dfn pnglibconf.h: pnglibconf.dfn
$(RM_F) $@ pnglibconf.c pnglibconf.out pnglibconf.tmp $(RM_F) $@ pnglibconf.c pnglibconf.out pnglibconf.tmp
$(ECHO) '#include "pnglibconf.dfn"' >pnglibconf.c echo '#include "pnglibconf.dfn"' >pnglibconf.c
$(ECHO) "If '$(CC) -E' crashes try /lib/cpp (e.g. CPP='/lib/cpp')" >&2 @echo "## If '$(CC) -E' fails, try /lib/cpp (e.g. CPP='/lib/cpp')" >&2
$(CPP) $(DFNFLAGS) pnglibconf.c >pnglibconf.out $(CPP) $(DFNFLAGS) pnglibconf.c >pnglibconf.out
$(AWK) -f "scripts/dfn.awk" out="pnglibconf.tmp" pnglibconf.out 1>&2 $(AWK) -f scripts/dfn.awk out=pnglibconf.tmp pnglibconf.out >&2
mv pnglibconf.tmp $@ $(MV_F) pnglibconf.tmp $@
pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA) pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA)
$(RM_F) $@ pnglibconf.pre pnglibconf.tmp $(RM_F) $@ pnglibconf.pre pnglibconf.tmp
$(ECHO) "Calling $(AWK) from scripts/pnglibconf.mak" >&2 @echo "## Calling $(AWK) from scripts/pnglibconf.mak" >&2
$(ECHO) "If 'awk' crashes try a better awk (e.g. AWK='nawk')" >&2 @echo "## If 'awk' fails, try a better awk (e.g. AWK='nawk')" >&2
$(AWK) -f scripts/options.awk out="pnglibconf.pre"\ $(AWK) -f scripts/options.awk out=pnglibconf.pre\
version=search pngconf.h scripts/pnglibconf.dfa\ version=search pngconf.h scripts/pnglibconf.dfa\
pngusr.dfa $(DFA_XTRA) 1>&2 pngusr.dfa $(DFA_XTRA) >&2
$(AWK) -f scripts/options.awk out="pnglibconf.tmp" pnglibconf.pre 1>&2 $(AWK) -f scripts/options.awk out=pnglibconf.tmp pnglibconf.pre >&2
mv pnglibconf.tmp $@ $(MV_F) pnglibconf.tmp $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

26
scripts/pnglibconf.mak
View File

@ -11,12 +11,12 @@ AWK = gawk
AWK = mawk AWK = mawk
AWK = nawk AWK = nawk
AWK = one-true-awk AWK = one-true-awk
AWK = awk # Crashes on SunOS 5.10 - use 'nawk' AWK = awk # This fails on SunOS 5.10; use 'nawk'
CPP = $(CC) -E # On SUN OS 5.10 if this causes problems use /lib/cpp CPP = $(CC) -E # If this fails on SunOS 5.10, use '/lib/cpp'
MOVE = mv MOVE = mv -f
DELETE = rm -f DELETE = rm -f
ECHO = echo
DFA_XTRA = # Put your configuration file here, see scripts/pnglibconf.dfa. Eg: DFA_XTRA = # Put your configuration file here, see scripts/pnglibconf.dfa. Eg:
# DFA_XTRA = pngusr.dfa # DFA_XTRA = pngusr.dfa
@ -25,27 +25,27 @@ DFA_XTRA = # Put your configuration file here, see scripts/pnglibconf.dfa. Eg:
# as appropriate # as appropriate
DFNFLAGS = $(DEFS) $(CPPFLAGS) $(CFLAGS) DFNFLAGS = $(DEFS) $(CPPFLAGS) $(CFLAGS)
# srcdir is a defacto standard for the location of the source # srcdir is a de-facto standard for the location of the source
srcdir = . srcdir = .
# The standard pnglibconf.h exists as scripts/pnglibconf.h.prebuilt, # The standard pnglibconf.h exists as scripts/pnglibconf.h.prebuilt,
# copy this if the following doesn't work. # copy this if the following doesn't work.
pnglibconf.h: pnglibconf.dfn pnglibconf.h: pnglibconf.dfn
$(DELETE) $@ pnglibconf.c pnglibconf.out pnglibconf.tmp $(DELETE) $@ pnglibconf.c pnglibconf.out pnglibconf.tmp
$(ECHO) '#include "pnglibconf.dfn"' >pnglibconf.c echo '#include "pnglibconf.dfn"' >pnglibconf.c
$(ECHO) "If '$(CC) -E' crashes try /lib/cpp (e.g. CPP='/lib/cpp')" >&2 @echo "## If '$(CC) -E' fails, try /lib/cpp (e.g. CPP='/lib/cpp')" >&2
$(CPP) $(DFNFLAGS) pnglibconf.c >pnglibconf.out $(CPP) $(DFNFLAGS) pnglibconf.c >pnglibconf.out
$(AWK) -f "$(srcdir)/scripts/dfn.awk" out="pnglibconf.tmp" pnglibconf.out 1>&2 $(AWK) -f $(srcdir)/scripts/dfn.awk out=pnglibconf.tmp pnglibconf.out >&2
$(MOVE) pnglibconf.tmp $@ $(MOVE) pnglibconf.tmp $@
pnglibconf.dfn: $(srcdir)/scripts/pnglibconf.dfa $(srcdir)/scripts/options.awk $(srcdir)/pngconf.h $(srcdir)/pngusr.dfa $(DFA_XTRA) pnglibconf.dfn: $(srcdir)/scripts/pnglibconf.dfa $(srcdir)/scripts/options.awk $(srcdir)/pngconf.h $(srcdir)/pngusr.dfa $(DFA_XTRA)
$(DELETE) $@ pnglibconf.pre pnglibconf.tmp $(DELETE) $@ pnglibconf.pre pnglibconf.tmp
$(ECHO) "Calling $(AWK) from scripts/pnglibconf.mak" >&2 @echo "## Calling $(AWK) from scripts/pnglibconf.mak" >&2
$(ECHO) "If 'awk' crashes try a better awk (e.g. AWK='nawk')" >&2 @echo "## If 'awk' fails, try a better awk (e.g. AWK='nawk')" >&2
$(AWK) -f $(srcdir)/scripts/options.awk out="pnglibconf.pre"\ $(AWK) -f $(srcdir)/scripts/options.awk out=pnglibconf.pre\
version=search $(srcdir)/pngconf.h $(srcdir)/scripts/pnglibconf.dfa\ version=search $(srcdir)/pngconf.h $(srcdir)/scripts/pnglibconf.dfa\
$(srcdir)/pngusr.dfa $(DFA_XTRA) 1>&2 $(srcdir)/pngusr.dfa $(DFA_XTRA) >&2
$(AWK) -f $(srcdir)/scripts/options.awk out="pnglibconf.tmp" pnglibconf.pre 1>&2 $(AWK) -f $(srcdir)/scripts/options.awk out=pnglibconf.tmp pnglibconf.pre >&2
$(MOVE) pnglibconf.tmp $@ $(MOVE) pnglibconf.tmp $@
clean-pnglibconf: clean-pnglibconf: