Goodbye register keyword. Compiler knows better.

[postgresql] / src / backend / Makefile

diff --git a/src/backend/Makefile b/src/backend/Makefile
index 3a4d23d6335713cae4f2a0f1fe4d0f2c2289af2d..60b2d6f60d2be6078b02e6a97a4d053caf35b0cd 100644 (file)
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.20 1997/03/12 20:44:57 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.30 1998/01/04 19:12:02 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -51,35 +51,40 @@ endif
 
 OBJS = $(DIRS:%=%/SUBSYS.o)
 
-ifeq ($(MAKE_EXPORTS), true)
-EXP = postgres$(EXPSUFF)
-else
-EXP =
+# kerberos flags
+
+ifdef KRBVERS
+CFLAGS+= $(KRBFLAGS)
+LDFLAGS+= $(KRBLIBS)
 endif
 
-all: postgres $(EXP) global1.bki.source local1_template1.bki.source
+
+all: postgres $(POSTGRES_IMP) global1.bki.source local1_template1.bki.source \
+                               global1.description local1_template1.description
 
 postgres: $(OBJS) ../utils/version.o
-       gcc -o postgres $(LDFLAGS) $(OBJS) ../utils/version.o $(LDADD) -lm -ldl
+       $(CC) -o postgres $(OBJS) ../utils/version.o $(LDFLAGS)
 
 $(OBJS): $(DIRS:%=%.dir)
 
 $(DIRS:%=%.dir):
-       $(MAKE) -C $(subst .dir,,$@) all PORTNAME=$(PORTNAME)
+       $(MAKE) -C $(subst .dir,,$@) all 
 
 ../utils/version.o:
        $(MAKE) -C ../utils version.o        
 
-global1.bki.source local1_template1.bki.source: catalog/$@
+global1.bki.source local1_template1.bki.source \
+global1.description local1_template1.description: catalog/$@
        cp catalog/$@ .
 
-catalog/global1.bki.source catalog/local1_template1.bki.source:
+catalog/global1.bki.source catalog/local1_template1.bki.source \
+catalog/global1.description catalog/local1_template1.description:
        $(MAKE) -C catalog $@
 
 # The postgres.o target is needed by the rule in Makefile.global that
 # creates the exports file when MAKE_EXPORTS = true.
 postgres.o: $(OBJS)
-       $(CC) $(LDFLAGS) -r -o postgres.o $(OBJS) $(LD_ADD)
+       $(CC) -r -o postgres.o $(OBJS) $(LDFLAGS)
 
 
 ############################################################################
@@ -96,12 +101,13 @@ fmgr.h:
 
 #############################################################################
 clean:
-       rm -f postgres fmgr.h parse.h \
-           global1.bki.source local1_template1.bki.source
-       for i in $(DIRS); do $(MAKE) -C $$i clean PORTNAME=$(PORTNAME); done
+       rm -f postgres $(POSTGRES_IMP) fmgr.h parse.h \
+           global1.bki.source local1_template1.bki.source \
+           global1.description local1_template1.description
+       for i in $(DIRS); do $(MAKE) -C $$i clean; done
 
 .DEFAULT:
-       for i in $(DIRS); do $(MAKE) -C $$i $@ PORTNAME=$(PORTNAME); done
+       for i in $(DIRS); do $(MAKE) -C $$i $@; done
 
 #############################################################################
 #
@@ -119,21 +125,25 @@ clean:
 # and (2) the parameters of a database system should be set at initdb time,
 # not at postgres build time.
 
-install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(EXP) fmgr.h\
+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$(EXPSUFF) $(LIBDIR)/postgres$(EXPSUFF)
+       $(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(LIBDIR)/$(POSTGRES_IMP)
 endif
        @rm -f $(BINDIR)/postmaster
-       cd $(BINDIR); ln -s postgres postmaster
+       ln -s postgres $(BINDIR)/postmaster
        $(INSTALL) $(INSTLOPTS) fmgr.h $(HEADERDIR)/fmgr.h
        $(INSTALL) $(INSTLOPTS) global1.bki.source \
          $(LIBDIR)/global1.bki.source
+       $(INSTALL) $(INSTLOPTS) global1.description \
+         $(LIBDIR)/global1.description
        $(INSTALL) $(INSTLOPTS) local1_template1.bki.source \
          $(LIBDIR)/local1_template1.bki.source
+       $(INSTALL) $(INSTLOPTS) local1_template1.description \
+         $(LIBDIR)/local1_template1.description
        $(INSTALL) $(INSTLOPTS) libpq/pg_hba.conf.sample \
          $(LIBDIR)/pg_hba.conf.sample
        $(INSTALL) $(INSTLOPTS) optimizer/geqo/pg_geqo.sample \
@@ -150,7 +160,7 @@ $(BINDIR) $(LIBDIR) $(HEADERDIR):
 # are up to date.  It saves the time of doing all the submakes.
 .PHONY: quick
 quick: $(OBJS)
-       $(CC) $(LDFLAGS) -o postgres $(OBJS) $(LD_ADD)
+       $(CC) -o postgres $(OBJS) $(LDFLAGS)
 
 #
 # Build the file, "./ID", used by the "gid" (grep-for-identifier) tool
@@ -158,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