diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | dpkg-deb/Makefile.am | 7 | ||||
| -rw-r--r-- | dpkg-split/Makefile.am | 7 | ||||
| -rw-r--r-- | dselect/Makefile.am | 7 | ||||
| -rw-r--r-- | lib/Makefile.am | 51 | ||||
| -rw-r--r-- | lib/compat/Makefile.am (renamed from libcompat/Makefile.am) | 2 | ||||
| -rw-r--r-- | lib/compat/alphasort.c (renamed from libcompat/alphasort.c) | 0 | ||||
| -rw-r--r-- | lib/compat/compat.h (renamed from libcompat/compat.h) | 0 | ||||
| -rw-r--r-- | lib/compat/getopt.c (renamed from libcompat/getopt.c) | 0 | ||||
| -rw-r--r-- | lib/compat/getopt.h (renamed from libcompat/getopt.h) | 0 | ||||
| -rw-r--r-- | lib/compat/getopt1.c (renamed from libcompat/getopt1.c) | 0 | ||||
| -rw-r--r-- | lib/compat/gettext.h (renamed from libcompat/gettext.h) | 0 | ||||
| -rw-r--r-- | lib/compat/obstack.c (renamed from libcompat/obstack.c) | 0 | ||||
| -rw-r--r-- | lib/compat/obstack.h (renamed from libcompat/obstack.h) | 0 | ||||
| -rw-r--r-- | lib/compat/scandir.c (renamed from libcompat/scandir.c) | 0 | ||||
| -rw-r--r-- | lib/compat/snprintf.c (renamed from libcompat/snprintf.c) | 0 | ||||
| -rw-r--r-- | lib/compat/strerror.c (renamed from libcompat/strerror.c) | 0 | ||||
| -rw-r--r-- | lib/compat/strnlen.c (renamed from libcompat/strnlen.c) | 0 | ||||
| -rw-r--r-- | lib/compat/strnlen.h (renamed from libcompat/strnlen.h) | 0 | ||||
| -rw-r--r-- | lib/compat/strsignal.c (renamed from libcompat/strsignal.c) | 0 | ||||
| -rw-r--r-- | lib/compat/unsetenv.c (renamed from libcompat/unsetenv.c) | 0 | ||||
| -rw-r--r-- | lib/compat/vsnprintf.c (renamed from libcompat/vsnprintf.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/.gitignore (renamed from lib/.gitignore) | 0 | ||||
| -rw-r--r-- | lib/dpkg/Makefile.am | 52 | ||||
| -rw-r--r-- | lib/dpkg/cleanup.c (renamed from lib/cleanup.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/compression.c (renamed from lib/compression.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/database.c (renamed from lib/database.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/dbmodify.c (renamed from lib/dbmodify.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/dlist.h (renamed from lib/dlist.h) | 0 | ||||
| -rw-r--r-- | lib/dpkg/dpkg-db.h (renamed from lib/dpkg-db.h) | 0 | ||||
| -rw-r--r-- | lib/dpkg/dpkg-def.h (renamed from lib/dpkg-def.h) | 0 | ||||
| -rw-r--r-- | lib/dpkg/dpkg-i18n.h (renamed from lib/dpkg-i18n.h) | 0 | ||||
| -rw-r--r-- | lib/dpkg/dpkg-priv.h (renamed from lib/dpkg-priv.h) | 0 | ||||
| -rw-r--r-- | lib/dpkg/dpkg-test.h (renamed from lib/dpkg-test.h) | 0 | ||||
| -rw-r--r-- | lib/dpkg/dpkg.h (renamed from lib/dpkg.h) | 0 | ||||
| -rw-r--r-- | lib/dpkg/dump.c (renamed from lib/dump.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/ehandle.c (renamed from lib/ehandle.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/fields.c (renamed from lib/fields.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/lock.c (renamed from lib/lock.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/log.c (renamed from lib/log.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/md5.c (renamed from lib/md5.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/md5.h (renamed from lib/md5.h) | 0 | ||||
| -rw-r--r-- | lib/dpkg/mlib.c (renamed from lib/mlib.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/myopt-util.c (renamed from lib/myopt-util.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/myopt.c (renamed from lib/myopt.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/myopt.h (renamed from lib/myopt.h) | 0 | ||||
| -rw-r--r-- | lib/dpkg/nfmalloc.c (renamed from lib/nfmalloc.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/parse.c (renamed from lib/parse.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/parsedump.h (renamed from lib/parsedump.h) | 0 | ||||
| -rw-r--r-- | lib/dpkg/parsehelp.c (renamed from lib/parsehelp.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/path.c (renamed from lib/path.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/progress.c (renamed from lib/progress.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/progress.h (renamed from lib/progress.h) | 0 | ||||
| -rw-r--r-- | lib/dpkg/showpkg.c (renamed from lib/showpkg.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/string.c (renamed from lib/string.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/subproc.c (renamed from lib/subproc.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/tarfn.c (renamed from lib/tarfn.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/tarfn.h (renamed from lib/tarfn.h) | 0 | ||||
| -rw-r--r-- | lib/dpkg/test/.gitignore (renamed from lib/test/.gitignore) | 0 | ||||
| -rw-r--r-- | lib/dpkg/test/Makefile.am (renamed from lib/test/Makefile.am) | 3 | ||||
| -rw-r--r-- | lib/dpkg/test/t-macros.c (renamed from lib/test/t-macros.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/test/t-path.c (renamed from lib/test/t-path.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/test/t-pkginfo.c (renamed from lib/test/t-pkginfo.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/test/t-string.c (renamed from lib/test/t-string.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/test/t-test.c (renamed from lib/test/t-test.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/test/t-varbuf.c (renamed from lib/test/t-varbuf.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/test/t-version.c (renamed from lib/test/t-version.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/trigdeferred.l (renamed from lib/trigdeferred.l) | 0 | ||||
| -rw-r--r-- | lib/dpkg/triglib.c (renamed from lib/triglib.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/utils.c (renamed from lib/utils.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/varbuf.c (renamed from lib/varbuf.c) | 0 | ||||
| -rw-r--r-- | lib/dpkg/vercmp.c (renamed from lib/vercmp.c) | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 15 | ||||
| -rw-r--r-- | utils/Makefile.am | 10 |
75 files changed, 89 insertions, 73 deletions
diff --git a/Makefile.am b/Makefile.am index 926ce2100..8749e5dde 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,6 @@ if WITH_DSELECT endif SUBDIRS = \ - libcompat \ lib \ src \ $(MAYBE_DSELECT) \ diff --git a/configure.ac b/configure.ac index 77eb5c050..90b6983b7 100644 --- a/configure.ac +++ b/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 diff --git a/dpkg-deb/Makefile.am b/dpkg-deb/Makefile.am index e948c4393..6015dbcec 100644 --- a/dpkg-deb/Makefile.am +++ b/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) \ diff --git a/dpkg-split/Makefile.am b/dpkg-split/Makefile.am index e596351c9..4d1421298 100644 --- a/dpkg-split/Makefile.am +++ b/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) diff --git a/dselect/Makefile.am b/dselect/Makefile.am index dfade7c91..15dc8067b 100644 --- a/dselect/Makefile.am +++ b/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) diff --git a/lib/Makefile.am b/lib/Makefile.am index 85c04ec1e..40c2a6b5b 100644 --- a/lib/Makefile.am +++ b/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 diff --git a/libcompat/Makefile.am b/lib/compat/Makefile.am index 65eac8662..c95f93710 100644 --- a/libcompat/Makefile.am +++ b/lib/compat/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 diff --git a/libcompat/alphasort.c b/lib/compat/alphasort.c index 7d50c7c00..7d50c7c00 100644 --- a/libcompat/alphasort.c +++ b/lib/compat/alphasort.c diff --git a/libcompat/compat.h b/lib/compat/compat.h index b0f22f93d..b0f22f93d 100644 --- a/libcompat/compat.h +++ b/lib/compat/compat.h diff --git a/libcompat/getopt.c b/lib/compat/getopt.c index 0a3a47e4d..0a3a47e4d 100644 --- a/libcompat/getopt.c +++ b/lib/compat/getopt.c diff --git a/libcompat/getopt.h b/lib/compat/getopt.h index 92951e59b..92951e59b 100644 --- a/libcompat/getopt.h +++ b/lib/compat/getopt.h diff --git a/libcompat/getopt1.c b/lib/compat/getopt1.c index b51be7f1b..b51be7f1b 100644 --- a/libcompat/getopt1.c +++ b/lib/compat/getopt1.c diff --git a/libcompat/gettext.h b/lib/compat/gettext.h index 3e80f7fb0..3e80f7fb0 100644 --- a/libcompat/gettext.h +++ b/lib/compat/gettext.h diff --git a/libcompat/obstack.c b/lib/compat/obstack.c index 8368f2889..8368f2889 100644 --- a/libcompat/obstack.c +++ b/lib/compat/obstack.c diff --git a/libcompat/obstack.h b/lib/compat/obstack.h index bb92232e5..bb92232e5 100644 --- a/libcompat/obstack.h +++ b/lib/compat/obstack.h diff --git a/libcompat/scandir.c b/lib/compat/scandir.c index b8854c72e..b8854c72e 100644 --- a/libcompat/scandir.c +++ b/lib/compat/scandir.c diff --git a/libcompat/snprintf.c b/lib/compat/snprintf.c index 238cf50e5..238cf50e5 100644 --- a/libcompat/snprintf.c +++ b/lib/compat/snprintf.c diff --git a/libcompat/strerror.c b/lib/compat/strerror.c index 5685d23b6..5685d23b6 100644 --- a/libcompat/strerror.c +++ b/lib/compat/strerror.c diff --git a/libcompat/strnlen.c b/lib/compat/strnlen.c index 09ba788ab..09ba788ab 100644 --- a/libcompat/strnlen.c +++ b/lib/compat/strnlen.c diff --git a/libcompat/strnlen.h b/lib/compat/strnlen.h index ba74dba7b..ba74dba7b 100644 --- a/libcompat/strnlen.h +++ b/lib/compat/strnlen.h diff --git a/libcompat/strsignal.c b/lib/compat/strsignal.c index d837e3d69..d837e3d69 100644 --- a/libcompat/strsignal.c +++ b/lib/compat/strsignal.c diff --git a/libcompat/unsetenv.c b/lib/compat/unsetenv.c index 20b4fc024..20b4fc024 100644 --- a/libcompat/unsetenv.c +++ b/lib/compat/unsetenv.c diff --git a/libcompat/vsnprintf.c b/lib/compat/vsnprintf.c index ab52af8fe..ab52af8fe 100644 --- a/libcompat/vsnprintf.c +++ b/lib/compat/vsnprintf.c diff --git a/lib/.gitignore b/lib/dpkg/.gitignore index ad7739ade..ad7739ade 100644 --- a/lib/.gitignore +++ b/lib/dpkg/.gitignore diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am new file mode 100644 index 000000000..15909ba07 --- /dev/null +++ b/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 diff --git a/lib/cleanup.c b/lib/dpkg/cleanup.c index 684501d9a..684501d9a 100644 --- a/lib/cleanup.c +++ b/lib/dpkg/cleanup.c diff --git a/lib/compression.c b/lib/dpkg/compression.c index da9b0f090..da9b0f090 100644 --- a/lib/compression.c +++ b/lib/dpkg/compression.c diff --git a/lib/database.c b/lib/dpkg/database.c index ab204f587..ab204f587 100644 --- a/lib/database.c +++ b/lib/dpkg/database.c diff --git a/lib/dbmodify.c b/lib/dpkg/dbmodify.c index 87400f1f9..87400f1f9 100644 --- a/lib/dbmodify.c +++ b/lib/dpkg/dbmodify.c diff --git a/lib/dlist.h b/lib/dpkg/dlist.h index 2812062a0..2812062a0 100644 --- a/lib/dlist.h +++ b/lib/dpkg/dlist.h diff --git a/lib/dpkg-db.h b/lib/dpkg/dpkg-db.h index 95630db5e..95630db5e 100644 --- a/lib/dpkg-db.h +++ b/lib/dpkg/dpkg-db.h diff --git a/lib/dpkg-def.h b/lib/dpkg/dpkg-def.h index b3222a396..b3222a396 100644 --- a/lib/dpkg-def.h +++ b/lib/dpkg/dpkg-def.h diff --git a/lib/dpkg-i18n.h b/lib/dpkg/dpkg-i18n.h index d89667f75..d89667f75 100644 --- a/lib/dpkg-i18n.h +++ b/lib/dpkg/dpkg-i18n.h diff --git a/lib/dpkg-priv.h b/lib/dpkg/dpkg-priv.h index f14fe6666..f14fe6666 100644 --- a/lib/dpkg-priv.h +++ b/lib/dpkg/dpkg-priv.h diff --git a/lib/dpkg-test.h b/lib/dpkg/dpkg-test.h index 6f00184c1..6f00184c1 100644 --- a/lib/dpkg-test.h +++ b/lib/dpkg/dpkg-test.h diff --git a/lib/dpkg.h b/lib/dpkg/dpkg.h index c30e8070f..c30e8070f 100644 --- a/lib/dpkg.h +++ b/lib/dpkg/dpkg.h diff --git a/lib/dump.c b/lib/dpkg/dump.c index a414691c7..a414691c7 100644 --- a/lib/dump.c +++ b/lib/dpkg/dump.c diff --git a/lib/ehandle.c b/lib/dpkg/ehandle.c index f430469a4..f430469a4 100644 --- a/lib/ehandle.c +++ b/lib/dpkg/ehandle.c diff --git a/lib/fields.c b/lib/dpkg/fields.c index 3cf6f524a..3cf6f524a 100644 --- a/lib/fields.c +++ b/lib/dpkg/fields.c diff --git a/lib/lock.c b/lib/dpkg/lock.c index 9a1cc11d0..9a1cc11d0 100644 --- a/lib/lock.c +++ b/lib/dpkg/lock.c diff --git a/lib/log.c b/lib/dpkg/log.c index bfd517764..bfd517764 100644 --- a/lib/log.c +++ b/lib/dpkg/log.c diff --git a/lib/md5.c b/lib/dpkg/md5.c index 2ce0575a0..2ce0575a0 100644 --- a/lib/md5.c +++ b/lib/dpkg/md5.c diff --git a/lib/md5.h b/lib/dpkg/md5.h index 6333725c4..6333725c4 100644 --- a/lib/md5.h +++ b/lib/dpkg/md5.h diff --git a/lib/mlib.c b/lib/dpkg/mlib.c index a626c328a..a626c328a 100644 --- a/lib/mlib.c +++ b/lib/dpkg/mlib.c diff --git a/lib/myopt-util.c b/lib/dpkg/myopt-util.c index 592f7f4f3..592f7f4f3 100644 --- a/lib/myopt-util.c +++ b/lib/dpkg/myopt-util.c diff --git a/lib/myopt.c b/lib/dpkg/myopt.c index 08ed0b457..08ed0b457 100644 --- a/lib/myopt.c +++ b/lib/dpkg/myopt.c diff --git a/lib/myopt.h b/lib/dpkg/myopt.h index 6bd363e63..6bd363e63 100644 --- a/lib/myopt.h +++ b/lib/dpkg/myopt.h diff --git a/lib/nfmalloc.c b/lib/dpkg/nfmalloc.c index a4715809f..a4715809f 100644 --- a/lib/nfmalloc.c +++ b/lib/dpkg/nfmalloc.c diff --git a/lib/parse.c b/lib/dpkg/parse.c index 059f9a229..059f9a229 100644 --- a/lib/parse.c +++ b/lib/dpkg/parse.c diff --git a/lib/parsedump.h b/lib/dpkg/parsedump.h index 10d2d97c8..10d2d97c8 100644 --- a/lib/parsedump.h +++ b/lib/dpkg/parsedump.h diff --git a/lib/parsehelp.c b/lib/dpkg/parsehelp.c index 7799d0a8d..7799d0a8d 100644 --- a/lib/parsehelp.c +++ b/lib/dpkg/parsehelp.c diff --git a/lib/path.c b/lib/dpkg/path.c index ea076a4db..ea076a4db 100644 --- a/lib/path.c +++ b/lib/dpkg/path.c diff --git a/lib/progress.c b/lib/dpkg/progress.c index 0e81e6736..0e81e6736 100644 --- a/lib/progress.c +++ b/lib/dpkg/progress.c diff --git a/lib/progress.h b/lib/dpkg/progress.h index dad6f3c44..dad6f3c44 100644 --- a/lib/progress.h +++ b/lib/dpkg/progress.h diff --git a/lib/showpkg.c b/lib/dpkg/showpkg.c index 219b31228..219b31228 100644 --- a/lib/showpkg.c +++ b/lib/dpkg/showpkg.c diff --git a/lib/string.c b/lib/dpkg/string.c index b8a9bb0b6..b8a9bb0b6 100644 --- a/lib/string.c +++ b/lib/dpkg/string.c diff --git a/lib/subproc.c b/lib/dpkg/subproc.c index 3b855ec04..3b855ec04 100644 --- a/lib/subproc.c +++ b/lib/dpkg/subproc.c diff --git a/lib/tarfn.c b/lib/dpkg/tarfn.c index 95a38ed1d..95a38ed1d 100644 --- a/lib/tarfn.c +++ b/lib/dpkg/tarfn.c diff --git a/lib/tarfn.h b/lib/dpkg/tarfn.h index 469d47699..469d47699 100644 --- a/lib/tarfn.h +++ b/lib/dpkg/tarfn.h diff --git a/lib/test/.gitignore b/lib/dpkg/test/.gitignore index 70ee4184e..70ee4184e 100644 --- a/lib/test/.gitignore +++ b/lib/dpkg/test/.gitignore diff --git a/lib/test/Makefile.am b/lib/dpkg/test/Makefile.am index bceda7882..56c15ccb0 100644 --- a/lib/test/Makefile.am +++ b/lib/dpkg/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 diff --git a/lib/test/t-macros.c b/lib/dpkg/test/t-macros.c index c89aea7f6..c89aea7f6 100644 --- a/lib/test/t-macros.c +++ b/lib/dpkg/test/t-macros.c diff --git a/lib/test/t-path.c b/lib/dpkg/test/t-path.c index de7258faa..de7258faa 100644 --- a/lib/test/t-path.c +++ b/lib/dpkg/test/t-path.c diff --git a/lib/test/t-pkginfo.c b/lib/dpkg/test/t-pkginfo.c index 0172d8f93..0172d8f93 100644 --- a/lib/test/t-pkginfo.c +++ b/lib/dpkg/test/t-pkginfo.c diff --git a/lib/test/t-string.c b/lib/dpkg/test/t-string.c index b05802b05..b05802b05 100644 --- a/lib/test/t-string.c +++ b/lib/dpkg/test/t-string.c diff --git a/lib/test/t-test.c b/lib/dpkg/test/t-test.c index 8e8d33f2c..8e8d33f2c 100644 --- a/lib/test/t-test.c +++ b/lib/dpkg/test/t-test.c diff --git a/lib/test/t-varbuf.c b/lib/dpkg/test/t-varbuf.c index 4157b8432..4157b8432 100644 --- a/lib/test/t-varbuf.c +++ b/lib/dpkg/test/t-varbuf.c diff --git a/lib/test/t-version.c b/lib/dpkg/test/t-version.c index e59fb167d..e59fb167d 100644 --- a/lib/test/t-version.c +++ b/lib/dpkg/test/t-version.c diff --git a/lib/trigdeferred.l b/lib/dpkg/trigdeferred.l index 40924935b..40924935b 100644 --- a/lib/trigdeferred.l +++ b/lib/dpkg/trigdeferred.l diff --git a/lib/triglib.c b/lib/dpkg/triglib.c index b9344b08e..b9344b08e 100644 --- a/lib/triglib.c +++ b/lib/dpkg/triglib.c diff --git a/lib/utils.c b/lib/dpkg/utils.c index 55a457aaf..55a457aaf 100644 --- a/lib/utils.c +++ b/lib/dpkg/utils.c diff --git a/lib/varbuf.c b/lib/dpkg/varbuf.c index 2b62fb886..2b62fb886 100644 --- a/lib/varbuf.c +++ b/lib/dpkg/varbuf.c diff --git a/lib/vercmp.c b/lib/dpkg/vercmp.c index 3e02adebe..3e02adebe 100644 --- a/lib/vercmp.c +++ b/lib/dpkg/vercmp.c diff --git a/src/Makefile.am b/src/Makefile.am index 33854e1a3..27d2b4455 100644 --- a/src/Makefile.am +++ b/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: diff --git a/utils/Makefile.am b/utils/Makefile.am index 33900ac29..c130f1984 100644 --- a/utils/Makefile.am +++ b/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) |