build: Integrate Gnulib non-recursively using fix-gnulib.

[upkg.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index eb605df6ffd6d46e98a9deaabe4e5ee558fd95da..8f5aac96c0828c133c7900327021ae43ab5b5cff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,14 +7,17 @@
 AUTOMAKE_OPTIONS = parallel-tests color-tests
 ACLOCAL_AMFLAGS = -I m4
 
+MOSTLYCLEANFILES =
+noinst_LTLIBRARIES =
+
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
 EXTRA_DIST = m4/gnulib-cache.m4
 
 dist_man_MANS = doc/man/upkg.1
 
-DIST_SUBDIRS = libltdl lib src
-SUBDIRS = lib
+DIST_SUBDIRS = libltdl src
+SUBDIRS = .
 
 if BUNDLED_LIBLTDL
 SUBDIRS += libltdl
@@ -23,7 +26,7 @@ endif
 SUBDIRS += src
 
 check_PROGRAMS = test/decodeindex
-test_decodeindex_LDADD = src/libupkg.la lib/libgnu.la
+test_decodeindex_LDADD = src/libupkg.la libgnu.la
 
 TESTS_ENVIRONMENT = SHELL='$(SHELL)' EXEEXT='$(EXEEXT)'
 TEST_EXTENSIONS = .sh
@@ -31,3 +34,5 @@ SH_LOG_COMPILER = $(SHELL)
 
 TESTS = tests/libupkg-index-decode.sh
 EXTRA_DIST += $(TESTS)
+
+include $(top_srcdir)/lib/gnulib.mk