Makefile cleanup.

This commit is contained in:
Bruce Momjian 1997-09-16 18:47:36 +00:00
parent df7a435587
commit f3a58f2639
5 changed files with 21 additions and 20 deletions
src/interfaces

@ -7,19 +7,20 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.1 1997/08/16 20:56:28 scrappy Exp $ # $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.2 1997/09/16 18:47:16 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
#include ../Makefile.global SRCDIR= ..
include $(SRCDIR)/Makefile.global
.DEFAULT all: .DEFAULT all:
$(MAKE) -C libpq $@ $(MAKE) -C libpq $@
ifeq ($(HAVE_Cplusplus), true) ifeq ($(HAVE_Cplusplus), true)
$(MAKE) -C libpq++ $@ $(MAKE) -C libpq++ $@
else
echo $(HAVE_Cplusplus): No C++
endif endif
ifeq ($(USE_TCL), true) ifeq ($(USE_TCL), true)
$(MAKE) -C libpgtcl $@ $(MAKE) -C libpgtcl $@
endif endif

@ -7,16 +7,16 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.13 1997/09/14 23:34:13 momjian Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.14 1997/09/16 18:47:19 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR= ../.. SRCDIR= ../..
include ../../Makefile.global :nclude $(SRCDIR)/Makefile.global
INCLUDE_OPT= \ INCLUDE_OPT= \
-I../../backend \ -I$(SRCDIR)/backend \
-I../../include \ -I$(SRCDIR)/include \
-I$(LIBPQDIR) \ -I$(LIBPQDIR) \
-I$(TCL_INCDIR) -I$(TCL_INCDIR)

@ -7,13 +7,13 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.8 1997/04/04 10:42:43 scrappy Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.9 1997/09/16 18:47:23 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR= .. SRCDIR= ../..
include ../Makefile.global include $(SRCDIR)/Makefile.global
SRCHEADERDIR = ../include SRCHEADERDIR = $(SRCDIR)/include
LIBPQHEADERDIR = $(SRCHEADERDIR)/libpq LIBPQHEADERDIR = $(SRCHEADERDIR)/libpq
LIBNAME= libpq++ LIBNAME= libpq++
@ -25,7 +25,7 @@ LIBNAME= libpq++
CXXFLAGS= $(CFLAGS) -Wno-error CXXFLAGS= $(CFLAGS) -Wno-error
INCLUDE_OPT= \ INCLUDE_OPT= \
-I../backend \ -I$(SRCDIR)/backend \
-I$(SRCHEADERDIR) \ -I$(SRCHEADERDIR) \
-I$(LIBPQDIR) -I$(LIBPQDIR)

@ -2,8 +2,8 @@
# Makefile for example programs # Makefile for example programs
# #
SRCDIR= ../.. SRCDIR= ../../..
include ../../Makefile.global include ../../../Makefile.global
LIBNAME= libpq++ LIBNAME= libpq++
@ -15,8 +15,8 @@ CXXFLAGS= $(CFLAGS) -Wno-error
INCLUDE_OPT= \ INCLUDE_OPT= \
-I.. \ -I.. \
-I../../backend \ -I../../../backend \
-I../../include \ -I../../../include \
-I$(LIBPQDIR) \ -I$(LIBPQDIR) \
-I$(HEADERDIR) -I$(HEADERDIR)
CXXFLAGS+= $(INCLUDE_OPT) CXXFLAGS+= $(INCLUDE_OPT)

@ -4,12 +4,12 @@
# Makefile for doc directory to install man pages # Makefile for doc directory to install man pages
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/man/Attic/Makefile,v 1.2 1997/01/08 07:32:58 scrappy Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpq++/man/Attic/Makefile,v 1.3 1997/09/16 18:47:36 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR= ../.. SRCDIR= ../../..
include ../../Makefile.global include ../../../Makefile.global
install: install:
-mkdir -p $(POSTMANDIR) -mkdir -p $(POSTMANDIR)