Hi,

Attached you'll find a (big) patch that fixes make dep and make
depend in all Makefiles where I found it to be appropriate.

It also removes the dependency in Makefile.global for NAMEDATALEN
and OIDNAMELEN by making backend/catalog/genbki.sh and bin/initdb/initdb.sh
a little smarter.

This no longer requires initdb.sh that is turned into initdb with
a sed script when installing Postgres, hence initdb.sh should be
renamed to initdb (after the patch has been applied :-) )

This patch is against the 6.3 sources, as it took a while to
complete.

Please review and apply,

Cheers,

Jeroen van Vianen

16 files changed, 38 insertions, 62 deletions

diff --git a/src/bin/Makefile b/src/bin/Makefile
index 7ab3ffcca1..6ca829e755 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -7,35 +7,22 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.11 1997/11/07 06:24:33 thomas Exp $
+#    $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.12 1998/04/06 00:27:50 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ..
 include ../Makefile.global
 
-.DEFAULT all:
-#
-# C programs
-#
-	$(MAKE) -C pg_id $@
-	$(MAKE) -C pg_version $@
-	$(MAKE) -C psql $@
-	$(MAKE) -C pg_dump $@
-	$(MAKE) -C pg_passwd $@
-#
-# Shell scripts
-# 
-	$(MAKE) -C cleardbdir $@
-	$(MAKE) -C createdb $@
-	$(MAKE) -C createuser $@
-	$(MAKE) -C destroydb $@
-	$(MAKE) -C destroyuser $@
-	$(MAKE) -C initdb $@
-	$(MAKE) -C initlocation $@
+DIRS = pg_id pg_version psql pg_dump pg_passwd cleardbdir createuser \
+	destroydb initdb initlocation
+
 #
 # TCL/TK programs
 #
 ifeq ($(USE_TCL), true)
-	$(MAKE) -C pgtclsh $@
+	DIRS += pgtclsh
 endif
+
+.DEFAULT all:
+	for i in $(DIRS); do $(MAKE) -C $$i $@; done
diff --git a/src/bin/cleardbdir/Makefile b/src/bin/cleardbdir/Makefile
index 9326f0260a..1d38b127a0 100644
--- a/src/bin/cleardbdir/Makefile
+++ b/src/bin/cleardbdir/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/cleardbdir/Attic/Makefile,v 1.5 1998/04/05 21:59:52 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/cleardbdir/Attic/Makefile,v 1.6 1998/04/06 00:27:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -25,4 +25,4 @@ install: cleardbdir
 clean: 
 	rm -f cleardbdir
 
-dep:
+dep depend:
diff --git a/src/bin/createdb/Makefile b/src/bin/createdb/Makefile
index e79c00f8ac..7e789dd9c4 100644
--- a/src/bin/createdb/Makefile
+++ b/src/bin/createdb/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/createdb/Attic/Makefile,v 1.5 1998/04/05 21:59:55 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/createdb/Attic/Makefile,v 1.6 1998/04/06 00:28:04 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -25,4 +25,4 @@ install: createdb
 clean:
 	rm -f createdb
 
-dep:
+dep depend:
diff --git a/src/bin/createuser/Makefile b/src/bin/createuser/Makefile
index c2ebf3b283..d63b0b2ee7 100644
--- a/src/bin/createuser/Makefile
+++ b/src/bin/createuser/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/createuser/Attic/Makefile,v 1.5 1998/04/05 21:59:59 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/createuser/Attic/Makefile,v 1.6 1998/04/06 00:28:16 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -29,4 +29,4 @@ install: createuser
 clean:
 	rm -f createuser
 
-dep:
+dep depend:
diff --git a/src/bin/destroydb/Makefile b/src/bin/destroydb/Makefile
index 95b8fa6944..fd59639d09 100644
--- a/src/bin/destroydb/Makefile
+++ b/src/bin/destroydb/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/destroydb/Attic/Makefile,v 1.5 1998/04/05 22:00:08 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/destroydb/Attic/Makefile,v 1.6 1998/04/06 00:28:25 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -25,4 +25,4 @@ install: destroydb
 clean:
 	rm -f destroydb
 
-dep:
+dep depend:
diff --git a/src/bin/destroyuser/Makefile b/src/bin/destroyuser/Makefile
index 1641bc6349..72a9c5572f 100644
--- a/src/bin/destroyuser/Makefile
+++ b/src/bin/destroyuser/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/Makefile,v 1.5 1998/04/05 22:00:20 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/Makefile,v 1.6 1998/04/06 00:28:37 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -29,4 +29,4 @@ install: destroyuser
 clean:
 	rm -f destroyuser
 
-dep:
+dep depend:
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index 06bb4b7640..67cd26bec1 100644
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -7,26 +7,19 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.5 1998/04/05 22:00:33 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.6 1998/04/06 00:28:46 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ../..
 include ../../Makefile.global
 
-SEDSCRIPT= \
-    -e "s^_fUnKy_NAMEDATALEN_sTuFf_^$(NAMEDATALEN)^g" \
-    -e "s^_fUnKy_OIDNAMELEN_sTuFf_^$(OIDNAMELEN)^g" 
-
 all: initdb
 
-initdb: initdb.sh
-	sed $(SEDSCRIPT) <initdb.sh >initdb
-
 install: initdb
 	$(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
 
 clean:
 	rm -f initdb
 
-dep:
+dep depend:
diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
index 8c1b81f3a9..cf3ddc5f28 100644
--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -26,7 +26,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.40 1998/03/22 19:35:30 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.41 1998/04/06 00:28:53 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -36,9 +36,6 @@
 #
 # ----------------
 
-NAMEDATALEN=_fUnKy_NAMEDATALEN_sTuFf_
-OIDNAMELEN=_fUnKy_OIDNAMELEN_sTuFf_
-
 CMDNAME=`basename $0`
 
 # Find the default PGLIB directory (the directory that contains miscellaneous 
@@ -266,8 +263,6 @@ echo "Running: postgres $BACKENDARGS template1"
 
 cat $TEMPLATE \
 | sed -e "s/postgres PGUID/$POSTGRES_SUPERUSERNAME $POSTGRES_SUPERUID/" \
-      -e "s/NAMEDATALEN/$NAMEDATALEN/g" \
-      -e "s/OIDNAMELEN/$OIDNAMELEN/g" \
       -e "s/PGUID/$POSTGRES_SUPERUID/" \
 | postgres $BACKENDARGS template1
 
@@ -296,8 +291,6 @@ if [ $template_only -eq 0 ]; then
 
     cat $GLOBAL \
     | sed -e "s/postgres PGUID/$POSTGRES_SUPERUSERNAME $POSTGRES_SUPERUID/" \
-        -e "s/NAMEDATALEN/$NAMEDATALEN/g" \
-        -e "s/OIDNAMELEN/$OIDNAMELEN/g" \
         -e "s/PGUID/$POSTGRES_SUPERUID/" \
     | postgres $BACKENDARGS template1
 
diff --git a/src/bin/initlocation/Makefile b/src/bin/initlocation/Makefile
index 21d26ab2b9..905a402c1a 100644
--- a/src/bin/initlocation/Makefile
+++ b/src/bin/initlocation/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.2 1998/04/05 22:00:40 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.3 1998/04/06 00:29:00 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -29,4 +29,4 @@ install: initlocation
 clean:
 	rm -f initlocation
 
-dep:
+dep depend:
diff --git a/src/bin/ipcclean/Makefile b/src/bin/ipcclean/Makefile
index 520244640f..0286c0c1f3 100644
--- a/src/bin/ipcclean/Makefile
+++ b/src/bin/ipcclean/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.4 1998/04/05 22:00:48 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.5 1998/04/06 00:29:03 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -28,4 +28,4 @@ install: ipcclean
 clean:
 	rm -f ipcclean
 
-dep:
+dep depend:
diff --git a/src/bin/pg_dump/Makefile.in b/src/bin/pg_dump/Makefile.in
index fa170a3208..7543d338b7 100644
--- a/src/bin/pg_dump/Makefile.in
+++ b/src/bin/pg_dump/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.6 1998/04/05 22:00:58 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.7 1998/04/06 00:29:08 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -43,7 +43,7 @@ install: pg_dump
 	$(INSTALL) $(INSTL_EXE_OPTS) pg_dumpall $(BINDIR)/pg_dumpall
 
 depend dep:
-	$(CC) -MM $(INCLUDE_OPT) *.c >depend
+	$(CC) -MM $(CFLAGS) *.c >depend
 
 clean: 
 	rm -f pg_dump $(OBJS) 
diff --git a/src/bin/pg_id/Makefile b/src/bin/pg_id/Makefile
index 41766e547b..075ced9a36 100644
--- a/src/bin/pg_id/Makefile
+++ b/src/bin/pg_id/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.8 1998/04/05 22:01:10 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.9 1998/04/06 00:29:14 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -36,7 +36,7 @@ install: pg_id
 	$(INSTALL) $(INSTL_EXE_OPTS) pg_id $(BINDIR)/pg_id
 
 depend dep:
-	$(CC) -MM $(INCLUDE_OPT) *.c >depend
+	$(CC) -MM $(CFLAGS) *.c >depend
 
 clean: 
 	rm -f pg_id $(OBJS) 
diff --git a/src/bin/pg_passwd/Makefile b/src/bin/pg_passwd/Makefile
index 439c1945c2..408640fea5 100644
--- a/src/bin/pg_passwd/Makefile
+++ b/src/bin/pg_passwd/Makefile
@@ -22,7 +22,7 @@ submake:
 	$(MAKE) -C $(LIBPQDIR) libpq.a
 
 depend dep:
-	$(CC) -MM $(INCLUDE_OPT) *.c >depend
+	$(CC) -MM $(CFLAGS) *.c >depend
 
 clean:
 	rm -f pg_passwd $(OBJS)
diff --git a/src/bin/pg_version/Makefile.in b/src/bin/pg_version/Makefile.in
index 470d33f172..8a10428ee3 100644
--- a/src/bin/pg_version/Makefile.in
+++ b/src/bin/pg_version/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile.in,v 1.2 1998/04/05 22:01:30 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile.in,v 1.3 1998/04/06 00:29:36 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -31,7 +31,7 @@ install: pg_version
 	$(INSTALL) $(INSTL_EXE_OPTS) pg_version $(BINDIR)/pg_version
 
 depend dep:
-	$(CC) -MM $(INCLUDE_OPT) *.c >depend
+	$(CC) -MM $(CFLAGS) *.c >depend
 
 clean: 
 	rm -f pg_version pg_version.o
diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile
index a386802bb4..1df38a830d 100644
--- a/src/bin/pgtclsh/Makefile
+++ b/src/bin/pgtclsh/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.14 1998/04/05 22:01:35 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.15 1998/04/06 00:29:46 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -42,3 +42,6 @@ install: pgtclsh pgtksh
 
 clean:
 	rm -f pgtclAppInit.o pgtkAppInit.o pgtclsh pgtksh
+
+dep depend:
+	$(CC) -MM $(CFLAGS) *.c > depend
diff --git a/src/bin/psql/Makefile.in b/src/bin/psql/Makefile.in
index 9722413c05..3a27c45a2c 100644
--- a/src/bin/psql/Makefile.in
+++ b/src/bin/psql/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.8 1998/04/05 22:01:41 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.9 1998/04/06 00:29:56 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -42,7 +42,7 @@ install: psql
 	$(INSTALL) $(INSTL_EXE_OPTS) psql $(BINDIR)/psql
 
 depend dep:
-	$(CC) -MM $(INCLUDE_OPT) *.c >depend
+	$(CC) -MM $(CFLAGS) *.c >depend
 
 clean: 
 	rm -f psql $(OBJS)