-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 module.h avl.h
-
-if BUILD_UPKG
+include_HEADERS = upkg.h uobject.h
+noinst_HEADERS = pack.h loadable.h exportable.h module.h avl.h
include engine/Makefile.inc
-bin_PROGRAMS = upkg
-upkg_SOURCES = upkg.c avl.c module.c exportable.c uobject.c
-upkg_CPPFLAGS = $(GLIB_CFLAGS) $(LTDLINCL)
-upkg_LDFLAGS = -export-dynamic
-upkg_LDADD = libupkg.la $(LIBLTDL) $(GLIB_LIBS)
+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)
-endif
+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