build: Integrate libltdl non-recursively using fix-ltdl.

[upkg.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8f5aac96c0828c133c7900327021ae43ab5b5cff..63b5927d64fbae4ef9213c53f957d9234e26ea7a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,8 +7,12 @@
 AUTOMAKE_OPTIONS = parallel-tests color-tests
 ACLOCAL_AMFLAGS = -I m4
 
+CLEANFILES =
 MOSTLYCLEANFILES =
+include_HEADERS =
+lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
+EXTRA_LTLIBRARIES =
 
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
@@ -16,14 +20,7 @@ EXTRA_DIST = m4/gnulib-cache.m4
 
 dist_man_MANS = doc/man/upkg.1
 
-DIST_SUBDIRS = libltdl src
-SUBDIRS = .
-
-if BUNDLED_LIBLTDL
-SUBDIRS += libltdl
-endif
-
-SUBDIRS += src
+SUBDIRS = . src
 
 check_PROGRAMS = test/decodeindex
 test_decodeindex_LDADD = src/libupkg.la libgnu.la
@@ -36,3 +33,6 @@ TESTS = tests/libupkg-index-decode.sh
 EXTRA_DIST += $(TESTS)
 
 include $(top_srcdir)/lib/gnulib.mk
+if BUNDLED_LIBLTDL
+include $(top_srcdir)/libltdl/ltdl.mk
+endif