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