update

[l4.git] / l4 / pkg / libpng / lib / dist / scripts / pnglibconf.mak

diff --git a/l4/pkg/libpng/lib/dist/scripts/pnglibconf.mak b/l4/pkg/libpng/lib/dist/scripts/pnglibconf.mak
index f8719185da29ff0bdede0b31f68eeadd2b67a33c..c799fb790b0888254a751c4048752bb9be192e84 100755 (executable)
--- a/l4/pkg/libpng/lib/dist/scripts/pnglibconf.mak
+++ b/l4/pkg/libpng/lib/dist/scripts/pnglibconf.mak
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # pnglibconf.mak - standard make lines for pnglibconf.h
-# 
+#
 # These lines are copied from Makefile.am, they illustrate
 # how to automate the build of pnglibconf.h from scripts/pnglibconf.dfa
 # given 'awk' and 'sed'
@@ -18,7 +18,8 @@ SED = sed
 COPY = cp
 DELETE = rm -f
 ECHO = echo
-DFA_XTRA = # Appended to scripts/options.awk
+DFA_XTRA = # Put your configuration file here, see scripts/pnglibconf.dfa.  Eg:
+# DFA_XTRA = pngusr.dfa
 
 # CPPFLAGS should contain the options to control the result,
 # but DEFS and CFLAGS are also supported here, override
@@ -35,18 +36,19 @@ pnglibconf.h: pnglibconf.dfn
        $(ECHO) '#include "pnglibconf.dfn"' >dfn.c
        $(CPP) $(DFNFLAGS) dfn.c >dfn1.out
        $(ECHO) "If 'cpp -e' crashes try /lib/cpp (e.g. CPP='/lib/cpp')" >&2
-       $(SED) -n -e 's|^.*PNG_DEFN_MAGIC-\(.*\)-PNG_DEFN_END.*$$|\1|p'\
+       $(SED) -n -e 's|^.*PNG_DEFN_MAGIC *-\(.*\)- *PNG_DEFN_END.*$$|\1|p'\
            dfn1.out >dfn2.out
-       $(SED) -e 's| *@@@ *||g' -e 's| *$$||' dfn2.out >dfn3.out
+       $(SED) -e 's| *PNG_JOIN *||g' -e 's| *$$||' dfn2.out >dfn3.out
        $(COPY) dfn3.out $@
        $(DELETE) dfn.c dfn1.out dfn2.out dfn3.out
 
-pnglibconf.dfn: $(srcdir)/scripts/pnglibconf.dfa $(srcdir)/scripts/options.awk
+pnglibconf.dfn: $(srcdir)/scripts/pnglibconf.dfa $(srcdir)/scripts/options.awk $(srcdir)/pngconf.h $(srcdir)/pngusr.dfa
        $(DELETE) $@ dfn1.out dfn2.out
        $(ECHO) "Calling $(AWK) from scripts/pnglibconf.mak" >&2
        $(ECHO) "If 'awk' crashes try a better awk (e.g. AWK='nawk')" >&2
-       $(AWK) -f $(srcdir)/scripts/options.awk out=dfn1.out\
-           $(srcdir)/scripts/pnglibconf.dfa $(DFA_XTRA) 1>&2
+       $(AWK) -f $(srcdir)/scripts/options.awk out=dfn1.out version=search\
+               $(srcdir)/pngconf.h $(srcdir)/scripts/pnglibconf.dfa\
+               $(srcdir)/pngusr.dfa $(DFA_XTRA) 1>&2
        $(AWK) -f $(srcdir)/scripts/options.awk out=dfn2.out dfn1.out 1>&2
        $(COPY) dfn2.out $@
        $(DELETE) dfn1.out dfn2.out