uobject: Move source files into the uobject directory.

diff --git a/src/Makefile.am b/src/Makefile.am
index 719a9526fbae8e49892340b31d258539d94426c7..f9224c3860774f0281081ddc2d0c0e38a541090b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,21 +6,15 @@
 
 AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
 
-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

diff --git a/src/uobject/Makefile.inc b/src/uobject/Makefile.inc
index c5cae96b2d66607c61ace87cd536f70b1c7e382d..7d4761a2570e4593a387790a8e725bf581c07e96 100644 (file)
--- a/src/uobject/Makefile.inc
+++ b/src/uobject/Makefile.inc
@@ -4,6 +4,15 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 
+lib_LTLIBRARIES += libuobject.la
+
 uobjectdir = $(includedir)/uobject
 uobject_HEADERS = uobject/uobject.h uobject/exportable.h uobject/loadable.h \
        uobject/module.h uobject/package.h
+noinst_HEADERS += uobject/avl.h
+
+libuobject_la_SOURCES  = uobject/uobject.c uobject/module.c uobject/avl.c \
+       uobject/package.c uobject/loadable.c uobject/exportable.c
+libuobject_la_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(LTDLINCL)
+libuobject_la_LIBADD   = $(LIBLTDL) $(GLIB_LIBS)
+libuobject_la_LDFLAGS  = -export-symbols-regex '^u_'

diff --git a/src/avl.c b/src/uobject/avl.c
similarity index 100%
rename from src/avl.c
rename to src/uobject/avl.c

diff --git a/src/avl.h b/src/uobject/avl.h
similarity index 100%
rename from src/avl.h
rename to src/uobject/avl.h

diff --git a/src/exportable.c b/src/uobject/exportable.c
similarity index 100%
rename from src/exportable.c
rename to src/uobject/exportable.c

diff --git a/src/loadable.c b/src/uobject/loadable.c
similarity index 100%
rename from src/loadable.c
rename to src/uobject/loadable.c

diff --git a/src/module.c b/src/uobject/module.c
similarity index 100%
rename from src/module.c
rename to src/uobject/module.c

diff --git a/src/package.c b/src/uobject/package.c
similarity index 100%
rename from src/package.c
rename to src/uobject/package.c

diff --git a/src/uobject.c b/src/uobject/uobject.c
similarity index 100%
rename from src/uobject.c
rename to src/uobject/uobject.c