X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/6d7453951662ebddd17f45bc2d7838ccdbbf4560..4637e82e74fc0fabefda27f01073ccc1305f36b8:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 719a952..c2019c3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,27 +4,22 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 
-AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
+AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
+AM_LDFLAGS  = -L$(top_builddir)/lib
 
-lib_LTLIBRARIES = libuobject.la libupkg.la
+lib_LTLIBRARIES = libupkg.la
 pkglib_LTLIBRARIES =
 
 include_HEADERS = upkg.h
-noinst_HEADERS  = pack.h avl.h
+noinst_HEADERS  = pack.h
 
 include uobject/Makefile.inc
 include engine/Makefile.inc
 
-libuobject_la_SOURCES  = uobject.c module.c avl.c package.c \
-	loadable.c exportable.c
-libuobject_la_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(LTDLINCL)
-libuobject_la_LIBADD   = $(LIBLTDL) $(GLIB_LIBS)
-libuobject_la_LDFLAGS  = -export-symbols-regex '^u_'
-
 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_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+upkg_LDFLAGS  = $(AM_LDFLAGS) -export-dynamic
 upkg_LDADD    = libuobject.la libupkg.la $(GLIB_LIBS) -lgnu