UPDATED PATCH:

[postgresql] / src / backend / libpq / Makefile

diff --git a/src/backend/libpq/Makefile b/src/backend/libpq/Makefile
index df3f015f0345939ccfe284cd6b09c422def7c9ce..cc4f750a7d68ba1e932bb36d47323449cede2808 100644 (file)
--- a/src/backend/libpq/Makefile
+++ b/src/backend/libpq/Makefile
@@ -4,43 +4,27 @@
 #    Makefile for libpq subsystem (backend half of libpq interface)
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.9 1997/12/17 04:58:58 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.33 2002/06/14 04:23:17 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../..
-include ../../Makefile.global
+subdir = src/backend/libpq
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
 
-INCLUDE_OPT = -I.. 
+# be-fsstubs is here for historical reasons, probably belongs elsewhere
 
-ifdef PORTNAME
-INCLUDE_OPT+=-I../port/$(PORTNAME) 
-endif
-
-CFLAGS+=$(INCLUDE_OPT)
-
-# kerberos flags
-ifdef KRBVERS
-CFLAGS+= $(KRBFLAGS)
-LDFLAGS+= $(KRBLIBS)
-endif
+OBJS = be-fsstubs.o be-secure.o auth.o crypt.o hba.o md5.o pqcomm.o \
+       pqformat.o pqsignal.o
 
-OBJS = be-dumpdata.o be-fsstubs.o be-pqexec.o pqcomprim.o\
-       auth.o hba.o crypt.o pqcomm.o portal.o util.o portalbuf.o pqpacket.o pqsignal.o \
-       password.o
 
 all: SUBSYS.o
 
 SUBSYS.o: $(OBJS)
-       $(LD) -r -o SUBSYS.o $(OBJS)
-
-be-dumpdata.o be-pqexec.o: ../fmgr.h
-
-../fmgr.h: 
-       $(MAKE) -C .. fmgr.h
+       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
 
 depend dep:
-       $(CC) -MM $(INCLUDE_OPT) *.c >depend
+       $(CC) -MM $(CFLAGS) *.c >depend
 
 clean: 
        rm -f SUBSYS.o $(OBJS) 
@@ -48,4 +32,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-