uobject: Split uobject stuff into its own library.

It is likely that libupkg will be merged into this library soon.

diff --git a/configure.ac b/configure.ac
index 16e4c65599e432046beda0fa29a972ced41bfcc3..d17e17fb620df711a8167e3bbb6eb6de7ed4de61 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,8 +18,7 @@ AM_CONDITIONAL([BUNDLED_LIBLTDL], [test x$LTDLDEPS != x])
 
 gl_INIT
 
-CHECK_GLIB_2([],[gobject], [have_gobject=yes], [have_gobject=no])
-AM_CONDITIONAL([BUILD_UPKG], [test x$have_gobject = xyes])
+CHECK_GLIB_2([], [gobject])
 
 AC_ARG_WITH([modlib],
        [AS_HELP_STRING([--with-modlib],

diff --git a/src/Makefile.am b/src/Makefile.am
index 128393a957ae0f8154d1796bf41ca4d5bd0fb600..1dcd24c857ac38a0af127d9479db0109d62a858c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,18 +1,18 @@
-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 loadable.h exportable.h uobject.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
 
+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 avl.c module.c loadable.c exportable.c uobject.c
-upkg_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \
-       $(GLIB_CFLAGS) $(LTDLINCL)
+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    = libupkg.la $(LIBLTDL) $(GLIB_LIBS) -lgnu
-
-endif
+upkg_LDADD    = libuobject.la libupkg.la $(GLIB_LIBS) -lgnu