X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/6bce0a077c3ffc8f74b4402d56bfbe7cbd6cba04..63c73995e982c084a1ec81304a17acdebd7cff1f:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 67e4d7b..237e2c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,18 +1,19 @@
-lib_LTLIBRARIES = libupkg.la
+lib_LTLIBRARIES = libuobject.la libupkg.la
 
-libupkg_la_SOURCES = libupkg.c pack.c
 include_HEADERS = upkg.h
-noinst_HEADERS = pack.h exportable.h uobject.h module.h avl.h
-
-if BUILD_UPKG
+noinst_HEADERS  = pack.h avl.h
 
+include uobject/Makefile.inc
 include engine/Makefile.inc
 
+libuobject_la_SOURCES  = uobject.c module.c avl.c loadable.c exportable.c
+libuobject_la_CPPFLAGS = $(GLIB_CFLAGS) $(LTDLINCL)
+libuobject_la_LIBADD   = $(LIBLTDL) $(GLIB_LIBS)
+
+libupkg_la_SOURCES = libupkg.c pack.c
+
 bin_PROGRAMS  = upkg
-upkg_SOURCES  = upkg.c avl.c module.c exportable.c uobject.c
-upkg_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \
-	$(GLIB_CFLAGS) $(LTDLINCL)
+upkg_SOURCES  = upkg.c
+upkg_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib $(GLIB_CFLAGS)
 upkg_LDFLAGS  = -L$(top_builddir)/lib -export-dynamic
-upkg_LDADD    = libupkg.la $(LIBLTDL) $(GLIB_LIBS) -lgnu
-
-endif
+upkg_LDADD    = libuobject.la libupkg.la $(GLIB_LIBS) -lgnu