Add rules to Makefile.conf, to rebuild Makefile if $(srcdir)/Makefile.in is

modified.  This also required adding a 'default' target to all Makefiles.

diff --git a/ChangeLog b/ChangeLog
index e8798f05d0aec4cfc688c1055b3163ce74dd33bb..697da8065de342bd07918ca47731c298b3b0d3c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun May 19 23:39:02 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * <all Makefile.in>, Makefile.conf.in: Add rules to Makefile.conf, to
+    rebuild Makefile if $(srcdir)/Makefile.in is modified.  This also
+    required adding a 'default' target to all Makefiles.
+
 Sun, 19 May 2002 22:56:41 -0500 Adam Heath <doogie@debian.org>
 
   * utils/md5sum.c: Fairly heavy work(net no lines changed), to fix

diff --git a/Makefile.conf.in b/Makefile.conf.in
index cfc55900e01957bc70f36d7233ca31cdac381ca2..d785fe6a2ae513a485fd9913fd0a2f64aa888386 100644 (file)
--- a/Makefile.conf.in
+++ b/Makefile.conf.in
@@ -34,6 +34,13 @@ sysconfdir           = @sysconfdir@
 dpkgconfdir            = $(sysconfdir)/$(PACKAGE)
 alternativesdir                = $(sysconfdir)/alternatives
 
+abs_builddir           = @abs_builddir@
+top_srcdir             = @top_srcdir@
+ifeq ($(strip $(srcdir)),$(strip $(top_srcdir)))
+subdir =
+else
+subdir = $(patsubst $(top_srcdir)/%,%,$(srcdir))/
+endif
 PERL                   = @PERL@
 mkinstalldirs          = $(SHELL) $(top_srcdir)/mkinstalldirs
 LN                     = @LN_S@
@@ -78,3 +85,10 @@ ALSO_STATIC          = @ALSO_STATIC@
 
 .cc.o:
        $(CXX) $(ALL_CXXFLAGS) -c $<
+
+Makefile: $(srcdir)/Makefile.in
+       (cd $(abs_builddir);CONFIG_FILES=$(subdir)$@ $(abs_builddir)/config.status)
+
+foobar:
+       @echo "srcdir='$(srcdir)'"
+       @echo "subdir='$(subdir)'"

diff --git a/Makefile.in b/Makefile.in
index dd4fb5dad0a425ba5a9cd144302a8bf21eabc346..fe3a761624ed879f8f1ea5fec36514a048e19629 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,6 +6,7 @@ VERSION         = $(shell cat version-nr)
 
 GENFILES       = version.h
 
+default: all
 include Makefile.conf
 
 SUBDIRS                = include optlib lib intl dpkg-deb split scripts utils main \

diff --git a/doc/Makefile.in b/doc/Makefile.in
index c9850480978d6e8cfdef8bf13df3fc3a636ee455..331dcd3b29f539834b6a25fa9bf04156723fa0b1 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -2,6 +2,8 @@ VPATH           = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
 
+default: all
+
 include ../Makefile.conf
 
 ifeq (@USE_SGML_DOC@, true)

diff --git a/dpkg-deb/Makefile.in b/dpkg-deb/Makefile.in
index f68ec75759aaabf0b405429e28690a97da8a06f4..8bbd2c5190e1098cdc36a13bbc28e32357231f43 100644 (file)
--- a/dpkg-deb/Makefile.in
+++ b/dpkg-deb/Makefile.in
@@ -5,6 +5,8 @@ top_srcdir      = @top_srcdir@
 top_builddir   = ..
 
 
+default: all
+
 include ../Makefile.conf
 
 

diff --git a/dselect/Makefile.in b/dselect/Makefile.in
index b98d73a9c4d43290df85b9f0ff875db295ef466d..d82f763af2673924540aa6f5bf8badaafd0ed2ec 100644 (file)
--- a/dselect/Makefile.in
+++ b/dselect/Makefile.in
@@ -3,6 +3,7 @@ srcdir          = @srcdir@
 top_srcdir     = @top_srcdir@
 top_builddir   = ..
 
+default: all
 include ../Makefile.conf
 
 CXX_SOURCES    = basecmds.cc baselist.cc basetop.cc bindings.cc curkeys.cc \

diff --git a/include/Makefile.in b/include/Makefile.in
index 56278a735ccaaf6e41ad7c16e401333723f424d4..ead2b58524885bae0782beef0c2d22ad5420ac3d 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -4,6 +4,7 @@ srcdir          = @srcdir@
 
 GENFILES       = dpkg.h
 
+default: all
 include ../Makefile.conf
 
 all:: $(GENFILES)

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 7d90e4b908c62724a5f9a51f34463abdbe6e3317..05b91e57c481bab562f4d1a9af04a10ab7a2ff8a 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -3,6 +3,7 @@ VPATH           = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
 
+default: all
 include ../Makefile.conf
 
 SOURCES                = compat.c database.c dbmodify.c dump.c ehandle.c fields.c \

diff --git a/main/Makefile.in b/main/Makefile.in
index 0c691c5b3d3bb5ac8d29dc9fff368ff7a0c590e8..be91254a71476de0b04dc8433fee42edef36036c 100644 (file)
--- a/main/Makefile.in
+++ b/main/Makefile.in
@@ -3,6 +3,7 @@ srcdir          = @srcdir@
 top_srcdir     = @top_srcdir@
 top_builddir   = ..
 
+default: all
 include ../Makefile.conf
 
 SOURCES                = main.c enquiry.c filesdb.c archives.c processarc.c \

diff --git a/man/Makefile.in b/man/Makefile.in
index 888b7f924f35a57134c95f344ef852b2b227e4dd..cc92c2eb588fe0c308fa47e6fd13752c9c42fe2f 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -4,6 +4,7 @@ top_srcdir      = @top_srcdir@
 
 SUBDIRS                = de en fr ja pt_BR ru sv
 
+default: all
 include ../Makefile.conf
 
 clean: clean-recursive

diff --git a/man/de/Makefile.in b/man/de/Makefile.in
index 332f5832dd7c0a998132ab06538aeee11bc67352..b727a50999ae8729ac1f2473fe38db7025dee3f7 100644 (file)
--- a/man/de/Makefile.in
+++ b/man/de/Makefile.in
@@ -2,6 +2,7 @@ VPATH           = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
 
+default: all
 include ../../Makefile.conf
 
 deman1dir      = $(subst $(mandir),$(mandir)/de,$(man1dir))

diff --git a/man/en/Makefile.in b/man/en/Makefile.in
index 4359d35b07ed694dbc5c297a331bff53deecc6ec..3bba3c5aa8a3293746ad3e90e49ab7c212a20320 100644 (file)
--- a/man/en/Makefile.in
+++ b/man/en/Makefile.in
@@ -2,6 +2,7 @@ VPATH           = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
 
+default: all
 include ../../Makefile.conf
 
 MAN5PAGES      = deb-control.5 deb-old.5 deb.5 dpkg.cfg.5 dselect.cfg.5

diff --git a/man/fr/Makefile.in b/man/fr/Makefile.in
index dbfe7752160f1396b2e46e657d9b91e68f42903a..3c693ea0a932f56ff13190d1ef787b109e4effe9 100644 (file)
--- a/man/fr/Makefile.in
+++ b/man/fr/Makefile.in
@@ -2,6 +2,7 @@ VPATH           = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
 
+default: all
 include ../../Makefile.conf
 
 frman1dir      = $(subst $(mandir),$(mandir)/fr,$(man1dir))

diff --git a/man/ja/Makefile.in b/man/ja/Makefile.in
index 7d55a0e6eca4d294e9c90ad08a9b8cf3ce43653d..d2d975953b4190a11dd8e390a36d0a8c77dae8b6 100644 (file)
--- a/man/ja/Makefile.in
+++ b/man/ja/Makefile.in
@@ -2,6 +2,7 @@ VPATH           = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
 
+default: all
 include ../../Makefile.conf
 
 jaman1dir      = $(subst $(mandir),$(mandir)/ja,$(man1dir))

diff --git a/man/pt_BR/Makefile.in b/man/pt_BR/Makefile.in
index 8dd5e28835ae66d6c2cab0b5c9dbaf2030b0560d..d1c934885d8a8641e12abd80686faffe98bc5bd1 100644 (file)
--- a/man/pt_BR/Makefile.in
+++ b/man/pt_BR/Makefile.in
@@ -2,6 +2,7 @@ VPATH           = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
 
+default: all
 include ../../Makefile.conf
 
 ptman8dir      = $(subst $(mandir),$(mandir)/pt_BR,$(man8dir))

diff --git a/man/ru/Makefile.in b/man/ru/Makefile.in
index 8f71b5d722e56206b86a3425aaecaf93e2470925..ae87df5c9eeeca39a4ac9e780e0d866870314341 100644 (file)
--- a/man/ru/Makefile.in
+++ b/man/ru/Makefile.in
@@ -2,6 +2,7 @@ VPATH           = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
 
+default: all
 include ../../Makefile.conf
 
 ruman1dir      = $(subst $(mandir),$(mandir)/ru,$(man1dir))

diff --git a/man/sv/Makefile.in b/man/sv/Makefile.in
index 47d2f2b0bbe655130965e9222dd358b1e91600c8..d2fce89a8803fe370dd0465c28768d95a4a2c480 100644 (file)
--- a/man/sv/Makefile.in
+++ b/man/sv/Makefile.in
@@ -2,6 +2,7 @@ VPATH           = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
 
+default: all
 include ../../Makefile.conf
 
 svman1dir      = $(subst $(mandir),$(mandir)/sv,$(man1dir))

diff --git a/methods/Makefile.in b/methods/Makefile.in
index 4fc6f3ce074e6c495634d4b095fd78fec7f9fcda..e002748f7966a9727bed17c78116e70ae4ec035b 100644 (file)
--- a/methods/Makefile.in
+++ b/methods/Makefile.in
@@ -2,6 +2,7 @@ VPATH           = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
 
+default: all
 include ../Makefile.conf
 
 # Available methods

diff --git a/optlib/Makefile.in b/optlib/Makefile.in
index 469ba07a1dd530c1c5200affc907cbd250502110..bbaa8061ff42596be7599d64dbcf6fb9b972cc1d 100644 (file)
--- a/optlib/Makefile.in
+++ b/optlib/Makefile.in
@@ -2,6 +2,7 @@ VPATH           = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
 
+default: all
 include ../Makefile.conf
 
 SOURCES                = getopt.c getopt1.c long-options.c closeout.c obstack.c

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index b985cf933a4623ca79e9e69c83601daaf71ce40a..a0c568060d2b4edd614ffc9846be5643a4a9c929 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -2,6 +2,7 @@ VPATH           = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
 
+default: all
 include ../Makefile.conf
 
 BIN_SCRIPTS            = dpkg-name dpkg-source dpkg-genchanges \

diff --git a/split/Makefile.in b/split/Makefile.in
index 5d8b900c553f8f75663db18835bb5855d135b968..f4e14ffcee578dface09626acfe060772b03bce3 100644 (file)
--- a/split/Makefile.in
+++ b/split/Makefile.in
@@ -2,8 +2,8 @@
 VPATH          = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
-top_builddir = ..
 
+default: all
 include ../Makefile.conf
 
 SPLIT_SOURCES          = queue.c split.c info.c join.c main.c

diff --git a/utils/Makefile.in b/utils/Makefile.in
index 0f5227c83a1e63873a8e05b778e4f73220a51f42..f2395865424275b741b3b45db4d7888cd76993ee 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -2,8 +2,8 @@
 VPATH          = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
-top_builddir   = ..
 
+default: all
 include ../Makefile.conf
 
 CFLAGS                 += -I$(top_srcdir)/optlib