Simplify make files, add full dependencies.

src/backend/regex/Makefile

@@ -0,0 +1,39 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for regex
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.1 1996/10/27 09:51:27 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../..
+include ../../Makefile.global
+
+INCLUDE_OPT = -I.. \
+              -I../port/$(PORTNAME) \
+              -I../include \
+              -I../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+CFLAGS+=-DPOSIX_MISTAKE 
+
+
+OBJS = regcomp.o regerror.o regexec.o regfree.o
+
+all: SUBSYS.o
+
+SUBSYS.o: $(OBJS)
+	$(LD) -r -o SUBSYS.o $(OBJS)
+
+depend dep:
+	$(CC) -MM $(INCLUDE_OPT) *.c >depend
+
+clean: 
+	rm -f SUBSYS.o $(OBJS) 
+
+ifeq (depend,$(wildcard depend))
+include depend
+endif
+

src/backend/regex/Makefile.inc

@@ -1,14 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-# regex sources
-VPATH:=$(VPATH):$(CURDIR)/regex
-
-CFLAGS+=-DPOSIX_MISTAKE -I$(CURDIR)/regex
-
-SRCS_REGEX=	regcomp.c regerror.c regexec.c regfree.c
-
-MAN3+=	regex.0
-MAN7+=	re_format.0
-
-MLINKS+=regex.3 regcomp.3 regex.3 regexec.3 regex.3 regerror.3
-MLINKS+=regexec.3 regfree.3