@@ -16,16 +16,17 @@ CP = cp
1616RM = rm -f
1717
1818
19- all : configures config.h .in \
20- srclib/Makefile.gnulib srclib/Makefile .in \
19+ all : srclib/Makefile.gnulib srclib/Makefile .in \
20+ configures config.h .in \
2121 include /iconv.h.build.in \
2222 lib/aliases.h lib/aliases_sysaix.h lib/aliases_syshpux.h lib/aliases_sysosf1.h lib/aliases_syssolaris.h \
2323 lib/aliases_aix.h lib/aliases_aix_sysaix.h \
2424 lib/aliases_osf1.h lib/aliases_osf1_sysosf1.h \
2525 lib/aliases_dos.h \
2626 lib/aliases_extra.h \
2727 lib/flags.h lib/translit.h \
28- man/iconv.1.html man/iconv.3.html man/iconv_close.3.html man/iconv_open.3.html man/iconvctl.3.html man/iconv_open_into.3.html force
28+ man/iconv.1.html man/iconv.3.html man/iconv_close.3.html man/iconv_open.3.html man/iconvctl.3.html man/iconv_open_into.3.html \
29+ force
2930 cd libcharset && $(MAKE) -f Makefile.devel all
3031 cd preload && $(MAKE) -f Makefile.devel all
3132
@@ -45,27 +46,6 @@ all : configures config.h.in \
4546# - $ make dist
4647
4748
48- CONFIGURES = configure
49- CONFIGURES_IN = configure.ac
50-
51- aclocal.m4 : $(CONFIGURES_IN ) srclib/Makefile.gnulib $(wildcard m4/* .m4) $(wildcard srcm4/* .m4)
52- $(ACLOCAL ) -I m4 -I srcm4 --output=$@ && touch $@
53-
54- configures : $(CONFIGURES )
55-
56- AUTOCONF_FILES = aclocal.m4 $(wildcard m4/* .m4) $(wildcard srcm4/* .m4)
57-
58- configure : configure.ac $(AUTOCONF_FILES )
59- $(AUTOCONF )
60-
61- check-configures : $(CONFIGURES )
62- set -e; for f in $( CONFIGURES) ; do bash -x -n $$ f; done
63-
64- config.h.in : configure.ac $(AUTOCONF_FILES )
65- $(AUTOHEADER )
66- touch $@
67-
68-
6949GNULIB_MODULES = \
7050 binary-io \
7151 error \
@@ -109,6 +89,27 @@ gnulib-imported-files : force
10989 fi
11090
11191
92+ CONFIGURES = configure
93+ CONFIGURES_IN = configure.ac
94+
95+ aclocal.m4 : $(CONFIGURES_IN ) srclib/Makefile.gnulib $(wildcard m4/* .m4) $(wildcard srcm4/* .m4)
96+ $(ACLOCAL ) -I m4 -I srcm4 --output=$@ && touch $@
97+
98+ configures : $(CONFIGURES )
99+
100+ AUTOCONF_FILES = aclocal.m4 $(wildcard m4/* .m4) $(wildcard srcm4/* .m4)
101+
102+ configure : configure.ac $(AUTOCONF_FILES )
103+ $(AUTOCONF )
104+
105+ check-configures : $(CONFIGURES )
106+ set -e; for f in $( CONFIGURES) ; do bash -x -n $$ f; done
107+
108+ config.h.in : configure.ac $(AUTOCONF_FILES )
109+ $(AUTOHEADER )
110+ touch $@
111+
112+
112113include/iconv.h.build.in : include/iconv.h.in include/export.h
113114 sed -e ' s/extern \([^"]\)/extern LIBICONV_DLL_EXPORTED \1/' \
114115 -e ' /_LIBICONV_VERSION/r include/export.h' \
0 commit comments