Use fix-gnulib's program integration.

Since we aren't building a library, we can use the program mode in
fix-gnulib which improves build time somewhat.

diff --git a/.gitignore b/.gitignore
index 37cda957957dba9f3fdf470a7f5857e43090f936..2a5a11d8abbfc8058bf9b5474d56daf0882a63de 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.a
 *.la
 *.lo
 *.o

diff --git a/Makefile.am b/Makefile.am
index 35666c6ecf5473beb5dda7e031235f03547c7236..85ab589d72a0c23ef6bfdd7b1741767b673a7f84 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,11 +6,11 @@
 
 ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
-CLEANFILES =
+CLEANFILES = $(EXTRA_LIBRARIES)
 DISTCLEANFILES =
 MOSTLYCLEANFILES =
 MAINTAINERCLEANFILES =
-noinst_LTLIBRARIES =
+EXTRA_LIBRARIES =
 EXTRA_DIST =
 
 AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \
@@ -20,7 +20,7 @@ AM_CFLAGS = $(LIBGERBV_CFLAGS) $(CNEARTREE_CFLAGS)
 bin_PROGRAMS = slotifier
 
 slotifier_SOURCES = src/slotifier.c
-slotifier_LDADD = $(LIBGERBV_LIBS) $(CNEARTREE_LIBS) libgnu.la \
+slotifier_LDADD = $(LIBGERBV_LIBS) $(CNEARTREE_LIBS) libgnu.a \
                   $(LTLIBICONV) $(LTLIBINTL) $(HYPOT_LIBM)
 $(slotifier_OBJECTS): $(gnulib_headers)
 

diff --git a/common b/common
index 92a89700c65e52fac8c2cace51a7112d60b3f42f..d4be634567f46d2af2dc0e78171f3639f2ff039f 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 92a89700c65e52fac8c2cace51a7112d60b3f42f
+Subproject commit d4be634567f46d2af2dc0e78171f3639f2ff039f

diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index ad7a83202d18725d9008aa3738a640880018764e..925e6d2b4dec30d55b72463eccefc6c2dcd11905 100644 (file)
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -36,7 +36,7 @@
 #  --aux-dir=. \
 #  --makefile-name=gnulib.mk.in \
 #  --conditional-dependencies \
-#  --libtool \
+#  --no-libtool \
 #  --macro-prefix=gl \
 #  --no-vc-files \
 #  getopt-gnu \
@@ -65,7 +65,6 @@ gl_TESTS_BASE([tests])
 gl_LIB([libgnu])
 gl_MAKEFILE_NAME([gnulib.mk.in])
 gl_CONDITIONAL_DEPENDENCIES
-gl_LIBTOOL
 gl_MACRO_PREFIX([gl])
 gl_PO_DOMAIN([])
 gl_WITNESS_C_MACRO([])