Reorder Makefile.devel.
diff --git a/ChangeLog b/ChangeLog
index f456679..55386e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-25 Bruno Haible <bruno@clisp.org>
+
+ Reorder Makefile.devel.
+ * Makefile.devel: Reorder: put gnulib targets before autotools targets.
+
2016-12-14 Bruno Haible <bruno@clisp.org>
Cleanup useless removals.
diff --git a/Makefile.devel b/Makefile.devel
index 30ca18a..3c9065b 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -16,8 +16,8 @@
RM = rm -f
-all : configures config.h.in \
- srclib/Makefile.gnulib srclib/Makefile.in \
+all : srclib/Makefile.gnulib srclib/Makefile.in \
+ configures config.h.in \
include/iconv.h.build.in \
lib/aliases.h lib/aliases_sysaix.h lib/aliases_syshpux.h lib/aliases_sysosf1.h lib/aliases_syssolaris.h \
lib/aliases_aix.h lib/aliases_aix_sysaix.h \
@@ -25,7 +25,8 @@
lib/aliases_dos.h \
lib/aliases_extra.h \
lib/flags.h lib/translit.h \
- 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
+ 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
cd libcharset && $(MAKE) -f Makefile.devel all
cd preload && $(MAKE) -f Makefile.devel all
@@ -45,27 +46,6 @@
# - $ make dist
-CONFIGURES = configure
-CONFIGURES_IN = configure.ac
-
-aclocal.m4 : $(CONFIGURES_IN) srclib/Makefile.gnulib $(wildcard m4/*.m4) $(wildcard srcm4/*.m4)
- $(ACLOCAL) -I m4 -I srcm4 --output=$@ && touch $@
-
-configures : $(CONFIGURES)
-
-AUTOCONF_FILES = aclocal.m4 $(wildcard m4/*.m4) $(wildcard srcm4/*.m4)
-
-configure : configure.ac $(AUTOCONF_FILES)
- $(AUTOCONF)
-
-check-configures : $(CONFIGURES)
- set -e; for f in $(CONFIGURES); do bash -x -n $$f; done
-
-config.h.in : configure.ac $(AUTOCONF_FILES)
- $(AUTOHEADER)
- touch $@
-
-
GNULIB_MODULES = \
binary-io \
error \
@@ -109,6 +89,27 @@
fi
+CONFIGURES = configure
+CONFIGURES_IN = configure.ac
+
+aclocal.m4 : $(CONFIGURES_IN) srclib/Makefile.gnulib $(wildcard m4/*.m4) $(wildcard srcm4/*.m4)
+ $(ACLOCAL) -I m4 -I srcm4 --output=$@ && touch $@
+
+configures : $(CONFIGURES)
+
+AUTOCONF_FILES = aclocal.m4 $(wildcard m4/*.m4) $(wildcard srcm4/*.m4)
+
+configure : configure.ac $(AUTOCONF_FILES)
+ $(AUTOCONF)
+
+check-configures : $(CONFIGURES)
+ set -e; for f in $(CONFIGURES); do bash -x -n $$f; done
+
+config.h.in : configure.ac $(AUTOCONF_FILES)
+ $(AUTOHEADER)
+ touch $@
+
+
include/iconv.h.build.in : include/iconv.h.in include/export.h
sed -e 's/extern \([^"]\)/extern LIBICONV_DLL_EXPORTED \1/' \
-e '/_LIBICONV_VERSION/r include/export.h' \
