Goodbye register keyword. Compiler knows better.

[postgresql] / src / backend / Makefile

diff --git a/src/backend/Makefile b/src/backend/Makefile
index ef80cebcd5a50fb18935c7b576ca12b15c089bbc..60b2d6f60d2be6078b02e6a97a4d053caf35b0cd 100644 (file)
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.28 1997/12/17 04:58:19 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.30 1998/01/04 19:12:02 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -51,6 +51,14 @@ endif
 
 OBJS = $(DIRS:%=%/SUBSYS.o)
 
+# kerberos flags
+
+ifdef KRBVERS
+CFLAGS+= $(KRBFLAGS)
+LDFLAGS+= $(KRBLIBS)
+endif
+
+
 all: postgres $(POSTGRES_IMP) global1.bki.source local1_template1.bki.source \
                                global1.description local1_template1.description
 
@@ -60,11 +68,7 @@ postgres: $(OBJS) ../utils/version.o
 $(OBJS): $(DIRS:%=%.dir)
 
 $(DIRS:%=%.dir):
-ifdef PORTNAME
-       $(MAKE) -C $(subst .dir,,$@) all PORTNAME=$(PORTNAME)
-else
        $(MAKE) -C $(subst .dir,,$@) all 
-endif
 
 ../utils/version.o:
        $(MAKE) -C ../utils version.o        
@@ -100,18 +104,10 @@ clean:
        rm -f postgres $(POSTGRES_IMP) fmgr.h parse.h \
            global1.bki.source local1_template1.bki.source \
            global1.description local1_template1.description
-ifdef PORTNAME
-       for i in $(DIRS); do $(MAKE) -C $$i clean PORTNAME=$(PORTNAME); done
-else
        for i in $(DIRS); do $(MAKE) -C $$i clean; done
-endif
 
 .DEFAULT:
-ifdef PORTNAME
-       for i in $(DIRS); do $(MAKE) -C $$i $@ PORTNAME=$(PORTNAME); done
-else
        for i in $(DIRS); do $(MAKE) -C $$i $@; done
-endif
 
 #############################################################################
 #
@@ -133,7 +129,6 @@ install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h\
          global1.bki.source local1_template1.bki.source \
          global1.description local1_template1.description \
          libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample
-       
        $(INSTALL) $(INSTL_EXE_OPTS) postgres $(BINDIR)/postgres
 ifeq ($(MAKE_EXPORTS), true)
        $(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(LIBDIR)/$(POSTGRES_IMP)
@@ -173,7 +168,7 @@ quick: $(OBJS)
 IDFILE=        ID
 .PHONY: $(IDFILE)
 $(IDFILE):
-       ./makeID $(PORTNAME)
+       ./makeID 
 
 #
 # Special rule to generate cpp'd version of a .c file.  This is