mirror of
https://github.com/postgres/postgres.git
synced 2025-11-19 13:42:17 +03:00
End of the make file simplifications.
This commit is contained in:
Bryan Henderson
@@ -7,40 +7,55 @@
|
||||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.4 1996/11/08 00:58:07 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.5 1996/11/12 11:42:09 bryanh Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
LIB= pgtcl
|
||||
SRCDIR= ..
|
||||
LIBPQDIR= $(SRCDIR)/libpq
|
||||
include ../Makefile.global
|
||||
|
||||
MKDIR= ../mk
|
||||
include $(MKDIR)/postgres.mk
|
||||
|
||||
CFLAGS+= -I$(HEADERDIR) \
|
||||
-I$(srcdir)/backend/include \
|
||||
-I$(srcdir)/backend \
|
||||
-I$(CURDIR) \
|
||||
-I$(TCL_INCDIR) \
|
||||
-I$(srcdir)/libpq
|
||||
|
||||
LIBLDLIBS+= -L$(LIBDIR) -lpq
|
||||
INCLUDE_OPT= \
|
||||
-I../backend \
|
||||
-I../include \
|
||||
-I$(LIBPQDIR) \
|
||||
-I$(TCL_INCDIR)
|
||||
|
||||
CFLAGS+= $(INCLUDE_OPT)
|
||||
ifdef KRBVERS
|
||||
CFLAGS+= $(KRBFLAGS)
|
||||
endif
|
||||
|
||||
ifdef LINUX_ELF
|
||||
CFLAGS += -fPIC
|
||||
CC += -L $(POSTGRESDIR)/lib -lpq
|
||||
endif
|
||||
|
||||
LIBSRCS= pgtcl.c pgtclCmds.c pgtclId.c
|
||||
OBJS= pgtcl.o pgtclCmds.o pgtclId.o
|
||||
|
||||
install-headers:
|
||||
all: libpgtcl.a
|
||||
|
||||
libpgtcl.a: $(OBJS)
|
||||
ifdef MK_NO_LORDER
|
||||
$(AR) $(AROPT) libpgtcl.a $(OBJS)
|
||||
else
|
||||
$(AR) $(AROPT) libpgtcl.a `lorder $(OBJS) | tsort`
|
||||
endif
|
||||
$(RANLIB) libpgtcl.a
|
||||
|
||||
.PHONY: beforeinstall-headers install-headers
|
||||
.PHONY: install install-libpgtcl
|
||||
|
||||
install: install-headers install-libpgtcl
|
||||
|
||||
install-headers: beforeinstall-headers libpgtcl.h
|
||||
$(INSTALL) $(INSTLOPTS) libpgtcl.h $(HEADERDIR)/libpgtcl.h
|
||||
|
||||
beforeinstall-headers:
|
||||
@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
|
||||
|
||||
install:: install-headers
|
||||
|
||||
include $(MKDIR)/postgres.lib.mk
|
||||
install-libpgtcl: libpgtcl.a
|
||||
$(INSTALL) $(INSTL_LIB_OPTS) libpgtcl.a $(DESTDIR)$(LIBDIR)/libpgtcl.a
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -f $(OBJS)
|
||||
@@ -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
|
||||
all: libpq++.a examples
|
||||
|
||||
.PHONY: beforeinstall-headers install-headers
|
||||
|
||||
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
|
||||
|
||||
HEADERFILES = libpq++.H
|
||||
.PHONY: examples
|
||||
examples:
|
||||
$(MAKE) -C examples all
|
||||
|
||||
install-headers: beforeinstall-headers
|
||||
@for i in ${HEADERFILES}; do \
|
||||
echo "Installing $(HEADERDIR)/$$i."; \
|
||||
$(INSTALL) -c -m 444 $$i $(HEADERDIR)/$$i; \
|
||||
done
|
||||
.PHONY: beforeinstall-headers install-headers
|
||||
.PHONY: install install-libpq++ doc
|
||||
|
||||
install:: install-headers
|
||||
install: install-headers install-libpq++ doc
|
||||
|
||||
include $(MKDIR)/postgres.lib.mk
|
||||
install-headers: beforeinstall-headers libpq++.H
|
||||
$(INSTALL) $(INSTLOPTS) libpq++.H $(HEADERDIR)/libpq++.H
|
||||
|
||||
beforeinstall-headers:
|
||||
@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
|
||||
|
||||
install-libpq++: libpq++.a
|
||||
$(INSTALL) $(INSTL_LIB_OPTS) libpq++.a $(DESTDIR)$(LIBDIR)/libpq++.a
|
||||
|
||||
doc:
|
||||
$(MAKE) -C man install
|
||||
|
||||
clean:
|
||||
rm libpq++.a $(OBJS)
|
||||
$(MAKE) -C examples clean
|
||||
@@ -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
|
||||
PROGS= testlibpq0 testlibpq1 testlibpq2 testlibpq3 testlibpq4 testlo
|
||||
|
||||
$(P0_PROG): $(addprefix $(objdir)/,$(P0_OBJS))
|
||||
$(CXX) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD)
|
||||
all: submake $(PROGS)
|
||||
|
||||
P1_PROG:= testlibpq1
|
||||
P1_OBJS:= testlibpq1.o
|
||||
$(PROGS): % : %.cc ../libpq++.a
|
||||
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $@.cc $(LD_ADD)
|
||||
|
||||
$(P1_PROG): $(addprefix $(objdir)/,$(P1_OBJS))
|
||||
$(CXX) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD)
|
||||
.PHONY: submake
|
||||
submake:
|
||||
$(MAKE) -C.. libpq++.a
|
||||
|
||||
P2_PROG:= testlibpq2
|
||||
P2_OBJS:= testlibpq2.o
|
||||
../libpq++.a:
|
||||
$(MAKE) -C.. libpq++.a
|
||||
|
||||
$(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
|
||||
|
||||
$(P5_PROG): $(addprefix $(objdir)/,$(P5_OBJS))
|
||||
$(CXX) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD)
|
||||
|
||||
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)
|
||||
|
||||
CLEANFILES+= $(OBJS) $(PROGS)
|
||||
|
||||
all:: $(PROGS)
|
||||
|
||||
install:: $(PROGS)
|
||||
@for i in ${PROGS}; do \
|
||||
echo "Installing $$i"; \
|
||||
$(INSTALL) $(objdir)/$$i $(DESTDIR)$(BINDIR)/$$i;\
|
||||
done
|
||||
clean:
|
||||
rm -f $(PROGS)
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.15 1996/11/09 06:24:51 momjian Exp $
|
||||
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.16 1996/11/12 11:42:21 bryanh Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
@@ -127,10 +127,10 @@ else
|
||||
install-shlib-dep :=
|
||||
endif
|
||||
|
||||
install-libpq:
|
||||
install-libpq: libpq.a
|
||||
$(INSTALL) $(INSTL_LIB_OPTS) libpq.a $(DESTDIR)$(LIBDIR)/libpq.a
|
||||
|
||||
install-shlib:
|
||||
install-shlib: libpq.so.1
|
||||
$(INSTALL) $(INSTL_LIB_OPTS) libpq.so.1 $(DESTDIR)$(LIBDIR)/libpq.so.1
|
||||
|
||||
depend dep:
|
||||
|
||||
Reference in New Issue
Block a user