Simplify make files, add full dependencies.

2 files changed, 62 insertions, 68 deletions

diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
new file mode 100644
index 0000000000..b596feead1
--- /dev/null
+++ b/src/backend/catalog/Makefile
@@ -0,0 +1,62 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for catalog
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.1 1996/10/27 09:47:07 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../..
+include ../../Makefile.global
+
+INCLUDE_OPT = -I.. \
+              -I../port/$(PORTNAME) \
+              -I../include \
+              -I../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = catalog.o heap.o index.o indexing.o \
+       pg_aggregate.o pg_operator.o pg_proc.o pg_type.o
+
+all: SUBSYS.o global1.bki.source local1_template1.bki.source
+
+SUBSYS.o: $(OBJS)
+	$(LD) -r -o SUBSYS.o $(OBJS)
+
+GENBKI= ./genbki.sh
+
+GLOBALBKI_SRCS= $(addprefix ../../include/catalog/, \
+                  pg_database.h pg_demon.h pg_magic.h pg_defaults.h \
+                  pg_variable.h pg_server.h pg_user.h pg_hosts.h \
+                  pg_group.h pg_log.h pg_time.h \
+                 )
+
+LOCALBKI_SRCS= $(addprefix ../../include/catalog/, \
+                 pg_proc.h pg_type.h pg_attribute.h pg_class.h \
+                 pg_inherits.h pg_index.h pg_version.h pg_statistic.h \
+                 pg_operator.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \
+                 pg_language.h pg_parg.h \
+                 pg_aggregate.h pg_ipl.h pg_inheritproc.h \
+                 pg_rewrite.h pg_listener.h indexing.h \
+                )
+
+global1.bki.source: $(GENBKI) $(GLOBALBKI_SRCS)
+	sh $(SHOPTS) $(GENBKI) $(BKIOPTS) $(GLOBALBKI_SRCS) > $@
+
+local1_template1.bki.source: $(GENBKI) $(LOCALBKI_SRCS)
+	sh $(SHOPTS) $(GENBKI) $(BKIOPTS) $(LOCALBKI_SRCS) > $@
+
+depend dep:
+	$(CC) -MM $(INCLUDE_OPT) *.c >depend
+
+clean: 
+	rm -f SUBSYS.o $(OBJS) global1.bki.source local1_template1.bki.source
+
+
+ifeq (depend,$(wildcard depend))
+include depend
+endif
+
diff --git a/src/backend/catalog/Makefile.inc b/src/backend/catalog/Makefile.inc
deleted file mode 100644
index 50c54664bd..0000000000
--- a/src/backend/catalog/Makefile.inc
+++ /dev/null
@@ -1,68 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for the system catalogs module
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/catalog/Attic/Makefile.inc,v 1.3 1996/09/26 04:22:49 momjian Exp $
-#
-#-------------------------------------------------------------------------
-
-catdir=$(CURDIR)/catalog
-VPATH:=$(VPATH):$(catdir)
-
-cat_hdr_dir= ../include/catalog
-
-SRCS_CATALOG= catalog.c heap.c index.c indexing.c \
-	pg_aggregate.c pg_operator.c pg_proc.c pg_type.c
-
-HEADERS+= catalog.h catname.h heap.h index.h indexing.h pg_aggregate.h \
-	pg_am.h pg_amop.h pg_amproc.h pg_attribute.h pg_database.h \
-	pg_defaults.h pg_demon.h pg_group.h pg_index.h pg_inheritproc.h \
-	pg_inherits.h pg_ipl.h pg_language.h pg_listener.h \
-	pg_log.h pg_magic.h pg_opclass.h pg_operator.h pg_parg.h \
-	pg_proc.h pg_class.h \
-	pg_rewrite.h pg_server.h pg_statistic.h pg_time.h pg_type.h \
-	pg_user.h pg_variable.h pg_version.h
-
-#
-# The following is to create the .bki.source files.
-# TODO: sort headers, (figure some automatic way of of determining
-#  the bki sources?)
-#
-# XXX - more grot.  includes names and uid's in the header file.  FIX THIS
-#  (not sure if i got this right - which do i need - or should i 
-#   burn the whole damned thing)
-#
-ifdef ALLOW_PG_GROUP
-BKIOPTS= -DALLOW_PG_GROUP
-endif
-
-GENBKI= $(catdir)/genbki.sh
-
-GLOBALBKI_SRCS= $(addprefix $(cat_hdr_dir)/, \
-                  pg_database.h pg_demon.h pg_magic.h pg_defaults.h \
-                  pg_variable.h pg_server.h pg_user.h pg_hosts.h \
-                  pg_group.h pg_log.h pg_time.h \
-                 )
-
-LOCALBKI_SRCS= $(addprefix $(cat_hdr_dir)/, \
-                 pg_proc.h pg_type.h pg_attribute.h pg_class.h \
-                 pg_inherits.h pg_index.h pg_version.h pg_statistic.h \
-                 pg_operator.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \
-                 pg_language.h pg_parg.h \
-                 pg_aggregate.h pg_ipl.h pg_inheritproc.h \
-                 pg_rewrite.h pg_listener.h indexing.h \
-                )
-
-global1.bki.source: $(GENBKI) $(GLOBALBKI_SRCS)
-	sh $(SHOPTS) $(GENBKI) $(BKIOPTS) $(GLOBALBKI_SRCS) > $(objdir)/$(@F)
-
-local1_template1.bki.source: $(GENBKI) $(LOCALBKI_SRCS)
-	sh $(SHOPTS) $(GENBKI) $(BKIOPTS) $(LOCALBKI_SRCS) > $(objdir)/$(@F)
-
-CLEANFILES+= global1.bki.source local1_template1.bki.source
-