-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)
+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