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

src/interfaces/ecpg/Makefile

@@ -1,4 +1,4 @@
-all install uninstall clean:
+all install uninstall clean dep depend:
 	$(MAKE) -C include $@
 	$(MAKE) -C lib $@
 	$(MAKE) -C preproc $@

src/interfaces/ecpg/include/Makefile

@@ -14,3 +14,5 @@ uninstall::
 	rm -f $(HEADERDIR)/ecpglib.h
 	rm -f $(HEADERDIR)/ecpgtype.h
 	rm -f $(HEADERDIR)/sqlca.h
+
+dep depend:

src/interfaces/ecpg/lib/Makefile.in

@@ -53,6 +53,8 @@ $(shlib): ecpglib.o typename.o
 clean:
 	rm -f *.o *.a core a.out *~ $(shlib) libecpg.so
 
+dep depend:
+
 install: libecpg.a $(shlib) $(install-shlib-dep)
 	$(INSTALL) $(INSTLOPTS) libecpg.a $(LIBDIR)
 

src/interfaces/ecpg/preproc/Makefile

@@ -20,6 +20,9 @@ install: all
 uninstall:
 	rm -f $(BINDIR)/ecpg
 
+dep depend:
+	$(CC) -MM $(CFLAGS) *.c > depend
+
 # Rule that really do something.
 ecpg: y.tab.o pgc.o type.o ecpg.o ../lib/typename.o
 	$(CC) -o ecpg y.tab.o pgc.o type.o ecpg.o ../lib/typename.o $(LEXLIB)

src/interfaces/ecpg/test/Makefile

@@ -12,3 +12,5 @@ perftest.c: perftest.pgc
 
 clean:
 	/bin/rm test2 test2.c perftest perftest.c log
+
+dep depend:

src/interfaces/jdbc/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for Java JDBC interface
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.6 1998/02/09 03:22:30 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.7 1998/04/06 00:30:36 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -44,6 +44,8 @@ all:	  postgresql.jar
 	@echo ------------------------------------------------------------
 	@echo
 
+dep depend:
+
 # This rule builds the javadoc documentation
 doc:
 	export CLASSPATH=.;\

src/interfaces/libpgtcl/Makefile.in

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.7 1998/04/05 22:02:29 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.8 1998/04/06 00:30:46 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -104,3 +104,5 @@ install-shlib: $(shlib)
 .PHONY: clean
 clean: 
 	rm -f $(OBJS) $(shlib) libpgtcl.a libpgtcl.so
+
+dep depend:

src/interfaces/libpq++/Makefile

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.11 1998/04/05 22:02:41 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.12 1998/04/06 00:31:13 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -117,9 +117,9 @@ clean:
 	rm $(LIBNAME).a $(OBJS)
 	$(MAKE) -C examples clean
 
+dep depend:
+	$(CXX) -MM $(CXXFLAGS) *.cc > depend
 
-###########################################################################
-# Dependencies for the library
-###########################################################################
-include ./dependencies
-
+ifeq (depend,$(wildcard depend))
+include depend
+endif

src/interfaces/libpq/Makefile.in

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.10 1998/04/05 22:02:33 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.11 1998/04/06 00:30:58 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -178,7 +178,7 @@ install-shlib: $(shlib)
 	ln -s $(shlib) $(LIBDIR)/libpq.so
 
 depend dep:
-	$(CC) -MM *.c >depend
+	$(CC) -MM $(CFLAGS) *.c >depend
 
 .PHONY: clean
 clean: