X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/382855dd3f69cdce3e3b4eb6da392f881e7825da..c6537566467e27e40028254b4c7da145417682cf:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 95e7082..237e2c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +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
-
-if BUILD_UPKG
-bin_PROGRAMS = upkg
-upkg_SOURCES = upkg.c exportable.c serializable.c music.c
-upkg_CFLAGS  = $(GLIB_CFLAGS)
-upkg_LDFLAGS = $(GLIB_LIBS)
-upkg_LDADD = libupkg.la $(LIBLTDL)
-endif
+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
+upkg_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib $(GLIB_CFLAGS)
+upkg_LDFLAGS  = -L$(top_builddir)/lib -export-dynamic
+upkg_LDADD    = libuobject.la libupkg.la $(GLIB_LIBS) -lgnu