X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/ebcf9b833bc750ce81951a3278065bbb86ecbdce..2e4fb6a2ae0e150b59cdec2113dd39af643d32ea:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index eb605df..63b5927 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,23 +7,23 @@
 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
 
 EXTRA_DIST = m4/gnulib-cache.m4
 
 dist_man_MANS = doc/man/upkg.1
 
-DIST_SUBDIRS = libltdl lib src
-SUBDIRS = lib
-
-if BUNDLED_LIBLTDL
-SUBDIRS += libltdl
-endif
-
-SUBDIRS += src
+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 +31,8 @@ SH_LOG_COMPILER = $(SHELL)
 
 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