Move libraries to subdirectories under lib/

This will allow to use the same include path than the future system
one, for example “#include <dpkg/dpkg.h>”. It also unclutters the source
topdir.

Makefile.am

@@ -5,7 +5,6 @@ if WITH_DSELECT
 endif
 
 SUBDIRS = \
-	libcompat \
 	lib \
 	src \
 	$(MAYBE_DSELECT) \

configure.ac

@@ -2,7 +2,7 @@
 
 AC_PREREQ(2.59)
 AC_INIT([dpkg], [1.15.4~], [debian-dpkg@lists.debian.org])
-AC_CONFIG_SRCDIR([lib/dpkg.h])
+AC_CONFIG_SRCDIR([lib/dpkg/dpkg.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])
 
@@ -109,9 +109,10 @@ AC_CONFIG_FILES([ Makefile
 		  dselect/Makefile
 		  dselect/methods/Makefile
 		  dselect/po/Makefile.in
-		  libcompat/Makefile
 		  lib/Makefile
-		  lib/test/Makefile
+		  lib/compat/Makefile
+		  lib/dpkg/Makefile
+		  lib/dpkg/test/Makefile
 		  man/Makefile
 		  po/Makefile.in
 		  scripts/Makefile

dpkg-deb/Makefile.am

@@ -3,7 +3,8 @@
 localedir = $(datadir)/locale
 INCLUDES = \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-idirafter $(top_srcdir)/libcompat \
+	-idirafter $(top_srcdir)/lib/compat \
+	-I$(top_srcdir)/lib/dpkg \
 	-I$(top_srcdir)/lib
 
 
@@ -17,8 +18,8 @@ dpkg_deb_SOURCES = \
 	main.c
 
 dpkg_deb_LDADD = \
-	../lib/libdpkg.a \
-	../libcompat/libcompat.a \
+	../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a \
 	$(LIBINTL) \
 	$(ZLIB_LIBS) \
 	$(BZ2_LIBS) \

dpkg-split/Makefile.am

@@ -4,7 +4,8 @@ localedir = $(datadir)/locale
 INCLUDES = \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DADMINDIR=\"$(admindir)\" -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\" \
-	-idirafter $(top_srcdir)/libcompat \
+	-idirafter $(top_srcdir)/lib/compat \
+	-I$(top_srcdir)/lib/dpkg \
 	-I$(top_srcdir)/lib
 
 
@@ -19,8 +20,8 @@ dpkg_split_SOURCES = \
 	split.c
 
 dpkg_split_LDADD = \
-	../lib/libdpkg.a \
-	../libcompat/libcompat.a \
+	../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a \
 	$(LIBINTL)
 
 

dselect/Makefile.am

@@ -7,7 +7,8 @@ INCLUDES = \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DADMINDIR=\"$(admindir)\" -DLIBDIR=\"$(pkglibdir)\" \
 	-DLOCALLIBDIR=\"/usr/local/lib/dpkg\" \
-	-idirafter $(top_srcdir)/libcompat \
+	-idirafter $(top_srcdir)/lib/compat \
+	-I$(top_srcdir)/lib/dpkg \
 	-I$(top_srcdir)/lib
 
 
@@ -38,8 +39,8 @@ dselect_SOURCES = \
 
 dselect_LDADD = \
 	$(CURSES_LIBS) \
-	../lib/libdpkg.a \
-	../libcompat/libcompat.a \
+	../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a \
 	$(LIBINTL)
 
 

lib/Makefile.am

@@ -1,51 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = test
+SUBDIRS = \
+	compat \
+	dpkg
 
-localedir = $(datadir)/locale
-pkgconfdir = $(sysconfdir)/@PACKAGE@
-INCLUDES = \
-	-DLOCALEDIR=\"$(localedir)\" \
-	-DCONFIGDIR=\"$(pkgconfdir)\" \
-	-DCOPYINGFILE=\"$(datadir)/common-licenses/GPL-2\" \
-	-idirafter $(top_srcdir)/libcompat
-
-
-noinst_LIBRARIES = libdpkg.a
-
-libdpkg_a_SOURCES = \
-	dpkg-def.h \
-	dpkg.h \
-	dpkg-i18n.h \
-	dpkg-db.h \
-	dpkg-priv.h \
-	dpkg-test.h \
-	dlist.h \
-	cleanup.c \
-	compression.c \
-	database.c \
-	dbmodify.c \
-	dump.c \
-	ehandle.c \
-	fields.c \
-	lock.c \
-	log.c \
-	md5.c md5.h \
-	mlib.c \
-	myopt.c myopt.h \
-	myopt-util.c \
-	nfmalloc.c \
-	parse.c \
-	parsehelp.c \
-	parsedump.h \
-	path.c \
-	progress.c progress.h \
-	showpkg.c \
-	string.c \
-	subproc.c \
-	tarfn.c tarfn.h \
-	triglib.c \
-	trigdeferred.l \
-	utils.c \
-	varbuf.c \
-	vercmp.c

libcompat/Makefile.am

@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = \
-	-idirafter $(top_srcdir)/libcompat
+	-idirafter $(top_srcdir)/lib/compat
 
 
 noinst_LIBRARIES = libcompat.a

lib/dpkg/Makefile.am

@@ -0,0 +1,52 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = test
+
+localedir = $(datadir)/locale
+pkgconfdir = $(sysconfdir)/@PACKAGE@
+INCLUDES = \
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DCONFIGDIR=\"$(pkgconfdir)\" \
+	-DCOPYINGFILE=\"$(datadir)/common-licenses/GPL-2\" \
+	-idirafter $(top_srcdir)/lib/compat \
+	-I$(top_srcdir)/lib
+
+
+noinst_LIBRARIES = libdpkg.a
+
+libdpkg_a_SOURCES = \
+	dpkg-def.h \
+	dpkg.h \
+	dpkg-i18n.h \
+	dpkg-db.h \
+	dpkg-priv.h \
+	dpkg-test.h \
+	dlist.h \
+	cleanup.c \
+	compression.c \
+	database.c \
+	dbmodify.c \
+	dump.c \
+	ehandle.c \
+	fields.c \
+	lock.c \
+	log.c \
+	md5.c md5.h \
+	mlib.c \
+	myopt.c myopt.h \
+	myopt-util.c \
+	nfmalloc.c \
+	parse.c \
+	parsehelp.c \
+	parsedump.h \
+	path.c \
+	progress.c progress.h \
+	showpkg.c \
+	string.c \
+	subproc.c \
+	tarfn.c tarfn.h \
+	triglib.c \
+	trigdeferred.l \
+	utils.c \
+	varbuf.c \
+	vercmp.c

lib/test/Makefile.am

@@ -1,7 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = \
-	-idirafter $(top_srcdir)/libcompat \
+	-idirafter $(top_srcdir)/lib/compat \
+	-I$(top_srcdir)/lib/dpkg \
 	-I$(top_srcdir)/lib
 
 

src/Makefile.am

@@ -4,7 +4,8 @@ localedir = $(datadir)/locale
 INCLUDES = \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DADMINDIR=\"$(admindir)\" \
-	-idirafter $(top_srcdir)/libcompat \
+	-idirafter $(top_srcdir)/lib/compat \
+	-I$(top_srcdir)/lib/dpkg \
 	-I$(top_srcdir)/lib
 
 
@@ -32,8 +33,8 @@ dpkg_SOURCES = \
 	update.c
 
 dpkg_LDADD = \
-	../lib/libdpkg.a \
-	../libcompat/libcompat.a \
+	../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a \
 	$(LIBINTL) \
 	$(ZLIB_LIBS) \
 	$(BZ2_LIBS) \
@@ -47,16 +48,16 @@ dpkg_query_SOURCES = \
 	query.c
 
 dpkg_query_LDADD = \
-	../lib/libdpkg.a \
-	../libcompat/libcompat.a \
+	../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a \
 	$(LIBINTL)
 
 dpkg_trigger_SOURCES = \
 	trigcmd.c
 
 dpkg_trigger_LDADD = \
-	../lib/libdpkg.a \
-	../libcompat/libcompat.a \
+	../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a \
 	$(LIBINTL)
 
 install-data-local:

utils/Makefile.am

@@ -3,7 +3,8 @@
 localedir = $(datadir)/locale
 INCLUDES = \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-idirafter $(top_srcdir)/libcompat \
+	-idirafter $(top_srcdir)/lib/compat \
+	-I$(top_srcdir)/lib/dpkg \
 	-I$(top_srcdir)/lib
 
 sbin_PROGRAMS =
@@ -14,7 +15,9 @@ if WITH_START_STOP_DAEMON
   start_stop_daemon_SOURCES = \
 	start-stop-daemon.c
 
-  start_stop_daemon_LDADD = ../libcompat/libcompat.a $(SSD_LIBS)
+  start_stop_daemon_LDADD = \
+	../lib/compat/libcompat.a \
+	$(SSD_LIBS)
 endif
 
 sbin_PROGRAMS += dpkg-install-info
@@ -22,7 +25,8 @@ sbin_PROGRAMS += dpkg-install-info
 # Automake has its own install-info rule, gah
 dpkg_install_info_SOURCES = install-info.c
 
-dpkg_install_info_LDADD = ../libcompat/libcompat.a
+dpkg_install_info_LDADD = \
+	../lib/compat/libcompat.a
 
 transform = s/dpkg-install-info/install-info/; $(program_transform_name)