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

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

22 files changed, 42 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e8798f05d..697da8065 100644
--- 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 cfc55900e..d785fe6a2 100644
--- 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 dd4fb5dad..fe3a76162 100644
--- 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 c98504809..331dcd3b2 100644
--- 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 f68ec7575..8bbd2c519 100644
--- 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 b98d73a9c..d82f763af 100644
--- 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 56278a735..ead2b5852 100644
--- 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 7d90e4b90..05b91e57c 100644
--- 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 0c691c5b3..be91254a7 100644
--- 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 888b7f924..cc92c2eb5 100644
--- 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 332f5832d..b727a5099 100644
--- 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 4359d35b0..3bba3c5aa 100644
--- 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 dbfe77521..3c693ea0a 100644
--- 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 7d55a0e6e..d2d975953 100644
--- 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 8dd5e2883..d1c934885 100644
--- 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 8f71b5d72..ae87df5c9 100644
--- 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 47d2f2b0b..d2fce89a8 100644
--- 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 4fc6f3ce0..e002748f7 100644
--- 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 469ba07a1..bbaa8061f 100644
--- 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 b985cf933..a0c568060 100644
--- 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 5d8b900c5..f4e14ffce 100644
--- 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 0f5227c83..f23958654 100644
--- 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