4 files changed, 67 insertions, 77 deletions
diff --git a/src/interfaces/libpq++/Makefile b/src/interfaces/libpq++/Makefile
index e1d58847ee5..3fb1f5d7249 100644
--- a/src/interfaces/libpq++/Makefile
+++ b/src/interfaces/libpq++/Makefile
@@ -7,48 +7,60 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.1.1.1 1996/07/09 06:22:18 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.2 1996/11/12 11:42:24 bryanh Exp $
 #
 #-------------------------------------------------------------------------
 
-CPP_LIB=	true
+SRCDIR= ..
+LIBPQDIR= $(SRCDIR)/libpq
+include ../Makefile.global
 
-LIB=	pq++
+CXXFLAGS= $(CFLAGS)
 
-MKDIR=	../mk
-include $(MKDIR)/postgres.mk
+INCLUDE_OPT= \
+             -I../backend \
+             -I../include \
+             -I$(LIBPQDIR) 
 
-CXXFLAGS = $(CFLAGS)
-
-CXXFLAGS+= -I$(srcdir)/backend/include \
-	-I$(srcdir)/backend \
-	-I$(srcdir)/libpq \
-	-I$(CURDIR) \
+CXXFLAGS+= $(INCLUDE_OPT) -DPOSTPORT='"$(POSTPORT)"'
 
 ifdef KRBVERS
 CXXFLAGS+= $(KRBFLAGS)
 endif
 
+OBJS= pgenv.o pgconnection.o pglobject.o
 
-LIBSRCS =  pgenv.cc pgconnection.cc pglobject.cc
-
-.PHONY: beforeinstall-headers install-headers
+all: libpq++.a examples
 
-ifndef NO_BEFOREINSTL
-beforeinstall-headers:
-	@-if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
+libpq++.a: $(OBJS)
+ifdef MK_NO_LORDER
+	$(AR) $(AROPT) libpq++.a $(OBJS)
 else
-beforeinstall-headers: .dosomething
+	$(AR) $(AROPT) libpq++.a `lorder $(OBJS) | tsort`
 endif
+	$(RANLIB) libpq++.a
+
+.PHONY: examples
+examples:
+	$(MAKE) -C examples all
 
-HEADERFILES = libpq++.H
+.PHONY: beforeinstall-headers install-headers 
+.PHONY: install install-libpq++ doc
+
+install: install-headers install-libpq++ doc
+
+install-headers: beforeinstall-headers libpq++.H
+	$(INSTALL) $(INSTLOPTS) libpq++.H $(HEADERDIR)/libpq++.H
+
+beforeinstall-headers:
+	@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
 
-install-headers: beforeinstall-headers
-	@for i in ${HEADERFILES}; do \
-		echo "Installing $(HEADERDIR)/$$i."; \
-		$(INSTALL) -c -m 444 $$i $(HEADERDIR)/$$i; \
-	done
+install-libpq++: libpq++.a
+	$(INSTALL) $(INSTL_LIB_OPTS) libpq++.a $(DESTDIR)$(LIBDIR)/libpq++.a
 
-install:: install-headers
+doc:
+	$(MAKE) -C man install
 
-include $(MKDIR)/postgres.lib.mk
+clean:
+	rm libpq++.a $(OBJS)
+	$(MAKE) -C examples clean
+\ No newline at end of file
diff --git a/src/interfaces/libpq++/examples/Makefile b/src/interfaces/libpq++/examples/Makefile
index 6010ab9faf4..e319a065c3b 100644
--- a/src/interfaces/libpq++/examples/Makefile
+++ b/src/interfaces/libpq++/examples/Makefile
@@ -2,15 +2,21 @@
 # Makefile for example programs
 #
 
-CPP_PROG = true
+SRCDIR= ../..
+LIBPQDIR= $(SRCDIR)/libpq
+include ../../Makefile.global
 
-MKDIR=	../../mk
-include $(MKDIR)/postgres.mk
+CXXFLAGS= $(CFLAGS)
 
-CXXFLAGS+= -I$(HEADERDIR) -I$(srcdir)/libpq -I$(srcdir)/backend \
- 	 -I$(srcdir)/backend/include
+INCLUDE_OPT= \
+             -I.. \
+             -I../../backend \
+             -I../../include \
+             -I$(LIBPQDIR) 
 
-LD_ADD+=-L$(LIBDIR) -lpq++ -lpq
+CXXFLAGS+= $(INCLUDE_OPT)
+
+LD_ADD+= -L.. -lpq++ -L$(LIBPQDIR) -lpq 
 
 #
 # And where libpq goes, so goes the authentication stuff...
@@ -20,51 +26,19 @@ LD_ADD+= $(KRBLIBS)
 CXXFLAGS+= $(KRBFLAGS)
 endif
 
-P0_PROG:= testlibpq0
-P0_OBJS:= testlibpq0.o
-
-$(P0_PROG):  $(addprefix $(objdir)/,$(P0_OBJS))
-	$(CXX) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD)
-
-P1_PROG:= testlibpq1
-P1_OBJS:= testlibpq1.o
-
-$(P1_PROG):  $(addprefix $(objdir)/,$(P1_OBJS))
-	$(CXX) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD)
-
-P2_PROG:= testlibpq2
-P2_OBJS:= testlibpq2.o
-
-$(P2_PROG):  $(addprefix $(objdir)/,$(P2_OBJS))
-	$(CXX) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD)
-
-P3_PROG:= testlibpq3
-P3_OBJS:= testlibpq3.o
-
-$(P3_PROG):  $(addprefix $(objdir)/,$(P3_OBJS))
-	$(CXX) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD)
-
-P4_PROG:= testlibpq4
-P4_OBJS:= testlibpq4.o
-
-$(P4_PROG):  $(addprefix $(objdir)/,$(P4_OBJS))
-	$(CXX) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD)
-
-P5_PROG:= testlo
-P5_OBJS:= testlo.o
+PROGS= testlibpq0 testlibpq1 testlibpq2 testlibpq3 testlibpq4 testlo
 
-$(P5_PROG):  $(addprefix $(objdir)/,$(P5_OBJS))
-	$(CXX) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD)
+all: submake $(PROGS)
 
-OBJS:= $(P0_OBJS) $(P1_OBJS) $(P2_OBJS) $(P3_OBJS) $(P4_OBJS) $(P5_OBJS)
-PROGS:= $(P0_PROG) $(P1_PROG) $(P2_PROG) $(P3_PROG) $(P4_PROG) $(P5_PROG)
+$(PROGS): % : %.cc ../libpq++.a
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $@.cc $(LD_ADD)
 
-CLEANFILES+= $(OBJS) $(PROGS)
+.PHONY: submake
+submake: 
+	$(MAKE) -C.. libpq++.a
 
-all:: $(PROGS)
+../libpq++.a:
+	$(MAKE) -C.. libpq++.a
 
-install:: $(PROGS)
-	@for i in ${PROGS}; do \
-		echo "Installing $$i"; \
-		$(INSTALL) $(objdir)/$$i $(DESTDIR)$(BINDIR)/$$i;\
-	done
+clean: 
+	rm -f $(PROGS)
diff --git a/src/interfaces/libpq++/libpq++.H b/src/interfaces/libpq++/libpq++.H
index 24482570f50..98581e7709e 100644
--- a/src/interfaces/libpq++/libpq++.H
+++ b/src/interfaces/libpq++/libpq++.H
@@ -14,7 +14,7 @@
  *
  *   IDENTIFICATION
  *
- * $Id: libpq++.H,v 1.2 1996/08/21 04:32:09 scrappy Exp $
+ * $Id: libpq++.H,v 1.3 1996/11/12 11:42:27 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,6 +26,8 @@
 #include <strings.h>
 
 extern "C" {
+#include "config.h"
+#include "postgres.h"
 #include "libpq-fe.h"
 #include "fe-auth.h"
 }
diff --git a/src/interfaces/libpq++/pglobject.cc b/src/interfaces/libpq++/pglobject.cc
index 20c7ad5e22d..4de4a1f0d9e 100644
--- a/src/interfaces/libpq++/pglobject.cc
+++ b/src/interfaces/libpq++/pglobject.cc
@@ -11,13 +11,15 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pglobject.cc,v 1.1.1.1 1996/07/09 06:22:18 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pglobject.cc,v 1.2 1996/11/12 11:42:31 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "libpq++.H"
 
 extern "C" {
+#include <unistd.h>
+#include <fcntl.h>
 #include "libpq/libpq-fs.h"
 }