Merge branch 'uobject' of git://git.draconx.ca/upkg into uobject

[upkg.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b89ed90c00c24b85777c2548046b22018e8444cf..ff1033aedfda2c2c7a65751e86b16a8661c7ca32 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,10 @@
 ACLOCAL_AMFLAGS = -I m4
 
-lib_LTLIBRARIES = libupkg.la
-bin_PROGRAMS = upkg
+DIST_SUBDIRS = libltdl lib src
+SUBDIRS = lib
 
-libupkg_la_SOURCES = libupkg.c pack.c
-include_HEADERS = upkg.h
-noinst_HEADERS = pack.h
+if BUNDLED_LIBLTDL
+SUBDIRS += libltdl
+endif
 
-upkg_SOURCES = upkg.c
-upkg_LDADD = libupkg.la
+SUBDIRS += src