Commit a0990e18 authored by Bruce Momjian's avatar Bruce Momjian

Makefile cleanup after reorganization

parent 1d0e3083
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
# Makefile for access/heap # Makefile for access/heap
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.2 1996/10/31 08:28:50 scrappy Exp $ # $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.3 1996/11/09 06:17:34 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../../port/$(PORTNAME) \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
# Makefile for access/transam # Makefile for access/transam
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.2 1996/11/03 09:07:03 scrappy Exp $ # $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.3 1996/11/09 06:17:38 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../../port/$(PORTNAME) \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for the bootstrap module # Makefile for the bootstrap module
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.2 1996/11/08 05:55:46 momjian Exp $ # $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.3 1996/11/09 06:17:44 momjian Exp $
# #
# #
# We must build bootparse.c and bootscanner.c with yacc and lex and sed, # We must build bootparse.c and bootscanner.c with yacc and lex and sed,
...@@ -23,7 +23,6 @@ include ../../Makefile.global ...@@ -23,7 +23,6 @@ include ../../Makefile.global
INCLUDE_OPT = -I.. \ INCLUDE_OPT = -I.. \
-I../port/$(PORTNAME) \ -I../port/$(PORTNAME) \
-I../include \
-I../../include -I../../include
CFLAGS += $(INCLUDE_OPT) -Wno-error CFLAGS += $(INCLUDE_OPT) -Wno-error
......
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
# Makefile for lib (miscellaneous stuff) # Makefile for lib (miscellaneous stuff)
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.2 1996/10/31 10:26:26 scrappy Exp $ # $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.3 1996/11/09 06:17:54 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../.. SRCDIR = ../..
include ../../Makefile.global include ../../Makefile.global
INCLUDE_OPT = -I../port/$(PORTNAME) \ INCLUDE_OPT = -I.. \
-I../port/$(PORTNAME) \
-I../../include -I../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for main # Makefile for main
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.1 1996/10/27 09:47:59 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.2 1996/11/09 06:18:04 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -13,7 +13,6 @@ include ../../Makefile.global ...@@ -13,7 +13,6 @@ include ../../Makefile.global
INCLUDE_OPT = -I.. \ INCLUDE_OPT = -I.. \
-I../port/$(PORTNAME) \ -I../port/$(PORTNAME) \
-I../include \
-I../../include -I../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
# Makefile for optimizer/path # Makefile for optimizer/path
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.2 1996/10/31 10:58:58 scrappy Exp $ # $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.3 1996/11/09 06:18:10 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../../port/$(PORTNAME) \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
# Makefile for optimizer/plan # Makefile for optimizer/plan
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.2 1996/10/31 10:59:05 scrappy Exp $ # $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.3 1996/11/09 06:18:17 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../../port/$(PORTNAME) \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
# Makefile for optimizer/prep # Makefile for optimizer/prep
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.2 1996/10/31 10:59:23 scrappy Exp $ # $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.3 1996/11/09 06:18:23 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../../port/$(PORTNAME) \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for parser # Makefile for parser
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.2 1996/11/08 05:57:18 momjian Exp $ # $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.3 1996/11/09 06:18:34 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -13,7 +13,6 @@ include ../../Makefile.global ...@@ -13,7 +13,6 @@ include ../../Makefile.global
INCLUDE_OPT = -I.. \ INCLUDE_OPT = -I.. \
-I../port/$(PORTNAME) \ -I../port/$(PORTNAME) \
-I../include \
-I../../include -I../../include
CFLAGS+=$(INCLUDE_OPT) -Wno-error CFLAGS+=$(INCLUDE_OPT) -Wno-error
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for port/BSD44_derived # Makefile for port/BSD44_derived
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/port/BSD44_derived/Attic/Makefile,v 1.1 1996/10/27 09:49:20 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/port/BSD44_derived/Attic/Makefile,v 1.2 1996/11/09 06:18:40 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,7 +12,6 @@ SRCDIR = ../../.. ...@@ -12,7 +12,6 @@ SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for port/aix # Makefile for port/aix
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/port/aix/Attic/Makefile,v 1.1 1996/10/27 09:49:27 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/port/aix/Attic/Makefile,v 1.2 1996/11/09 06:18:48 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,7 +12,6 @@ SRCDIR = ../../.. ...@@ -12,7 +12,6 @@ SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for port/alpha # Makefile for port/alpha
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/port/alpha/Attic/Makefile,v 1.1 1996/10/27 09:49:37 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/port/alpha/Attic/Makefile,v 1.2 1996/11/09 06:18:57 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,7 +12,6 @@ SRCDIR = ../../.. ...@@ -12,7 +12,6 @@ SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for port/bsdi # Makefile for port/bsdi
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.3 1996/11/01 03:35:54 momjian Exp $ # $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.4 1996/11/09 06:19:06 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,7 +12,6 @@ SRCDIR = ../../.. ...@@ -12,7 +12,6 @@ SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for port/dgux # Makefile for port/dgux
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/port/dgux/Attic/Makefile,v 1.1 1996/10/27 09:49:57 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/port/dgux/Attic/Makefile,v 1.2 1996/11/09 06:19:14 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,7 +12,6 @@ SRCDIR = ../../.. ...@@ -12,7 +12,6 @@ SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for port/hpux # Makefile for port/hpux
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/port/hpux/Attic/Makefile,v 1.1 1996/10/27 09:50:12 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/port/hpux/Attic/Makefile,v 1.2 1996/11/09 06:19:21 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,7 +12,6 @@ SRCDIR = ../../.. ...@@ -12,7 +12,6 @@ SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for port/i386_solaris # Makefile for port/i386_solaris
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/port/i386_solaris/Attic/Makefile,v 1.1 1996/10/27 09:50:17 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/port/i386_solaris/Attic/Makefile,v 1.2 1996/11/09 06:19:27 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,7 +12,6 @@ SRCDIR = ../../.. ...@@ -12,7 +12,6 @@ SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for port/irix5 # Makefile for port/irix5
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/port/irix5/Attic/Makefile,v 1.1 1996/10/27 09:50:24 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/port/irix5/Attic/Makefile,v 1.2 1996/11/09 06:19:36 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,7 +12,6 @@ SRCDIR = ../../.. ...@@ -12,7 +12,6 @@ SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for port/linux # Makefile for port/linux
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/port/linux/Attic/Makefile,v 1.1 1996/10/27 09:50:31 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/port/linux/Attic/Makefile,v 1.2 1996/11/09 06:19:51 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,7 +12,6 @@ SRCDIR = ../../.. ...@@ -12,7 +12,6 @@ SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for port/sparc # Makefile for port/sparc
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/port/sparc/Attic/Makefile,v 1.1 1996/10/27 09:50:43 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/port/sparc/Attic/Makefile,v 1.2 1996/11/09 06:20:07 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,7 +12,6 @@ SRCDIR = ../../.. ...@@ -12,7 +12,6 @@ SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for port/sparc_solaris # Makefile for port/sparc_solaris
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/port/sparc_solaris/Attic/Makefile,v 1.1 1996/10/27 09:50:50 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/port/sparc_solaris/Attic/Makefile,v 1.2 1996/11/09 06:20:17 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,7 +12,6 @@ SRCDIR = ../../.. ...@@ -12,7 +12,6 @@ SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for port/svr4 # Makefile for port/svr4
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/port/svr4/Attic/Makefile,v 1.1 1996/10/27 09:50:57 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/port/svr4/Attic/Makefile,v 1.2 1996/11/09 06:20:26 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,7 +12,6 @@ SRCDIR = ../../.. ...@@ -12,7 +12,6 @@ SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for port/ultrix # Makefile for port/ultrix
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/port/ultrix4/Attic/Makefile,v 1.1 1996/10/27 09:51:05 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/port/ultrix4/Attic/Makefile,v 1.2 1996/11/09 06:20:36 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,7 +12,6 @@ SRCDIR = ../../.. ...@@ -12,7 +12,6 @@ SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
# Makefile for postmaster # Makefile for postmaster
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.2 1996/11/03 04:48:27 scrappy Exp $ # $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.3 1996/11/09 06:20:48 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../.. SRCDIR = ../..
include ../../Makefile.global include ../../Makefile.global
INCLUDE_OPT = -I../port/$(PORTNAME) \ INCLUDE_OPT = -I.. \
-I../port/$(PORTNAME) \
-I../../include -I../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for regex # Makefile for regex
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.1 1996/10/27 09:51:27 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.2 1996/11/09 06:20:58 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -13,7 +13,6 @@ include ../../Makefile.global ...@@ -13,7 +13,6 @@ include ../../Makefile.global
INCLUDE_OPT = -I.. \ INCLUDE_OPT = -I.. \
-I../port/$(PORTNAME) \ -I../port/$(PORTNAME) \
-I../include \
-I../../include -I../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
# Makefile for rewrite # Makefile for rewrite
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.2 1996/11/03 04:51:50 scrappy Exp $ # $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.3 1996/11/09 06:21:12 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../.. SRCDIR = ../..
include ../../Makefile.global include ../../Makefile.global
INCLUDE_OPT = -I../port/$(PORTNAME) \ INCLUDE_OPT = -I.. \
-I../port/$(PORTNAME) \
-I../../include -I../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
# Makefile for storage/buffer # Makefile for storage/buffer
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.2 1996/11/03 04:56:57 scrappy Exp $ # $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.3 1996/11/09 06:21:30 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../../port/$(PORTNAME) \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for storage/file # Makefile for storage/file
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.1 1996/10/27 09:52:01 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.2 1996/11/09 06:21:38 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -13,7 +13,6 @@ include ../../../Makefile.global ...@@ -13,7 +13,6 @@ include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \ -I../../port/$(PORTNAME) \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
# Makefile for storage/ipc # Makefile for storage/ipc
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.2 1996/11/03 05:06:52 scrappy Exp $ # $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.3 1996/11/09 06:21:47 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../../port/$(PORTNAME) \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
# Makefile for storage/large_object # Makefile for storage/large_object
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.2 1996/11/03 05:07:07 scrappy Exp $ # $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.3 1996/11/09 06:21:59 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../../port/$(PORTNAME) \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
# Makefile for storage/lmgr # Makefile for storage/lmgr
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.2 1996/11/03 05:07:19 scrappy Exp $ # $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.3 1996/11/09 06:22:05 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../../port/$(PORTNAME) \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
# Makefile for storage/page # Makefile for storage/page
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.2 1996/11/03 05:07:43 scrappy Exp $ # $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.3 1996/11/09 06:22:14 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../../port/$(PORTNAME) \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
# Makefile for storage/smgr # Makefile for storage/smgr
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.2 1996/11/03 05:07:50 scrappy Exp $ # $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.3 1996/11/09 06:22:28 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../../port/$(PORTNAME) \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
# Makefile for tcop # Makefile for tcop
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.4 1996/11/08 05:59:20 momjian Exp $ # $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.5 1996/11/09 06:22:37 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../.. SRCDIR = ../..
include ../../Makefile.global include ../../Makefile.global
INCLUDE_OPT = -I../port/$(PORTNAME) \ INCLUDE_OPT = -I.. \
-I../port/$(PORTNAME) \
-I../../include -I../../include
CFLAGS+=$(INCLUDE_OPT) -Wno-error CFLAGS+=$(INCLUDE_OPT) -Wno-error
......
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
# Makefile for tioga # Makefile for tioga
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.2 1996/11/03 06:52:43 scrappy Exp $ # $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.3 1996/11/09 06:22:42 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../.. SRCDIR = ../..
include ../../Makefile.global include ../../Makefile.global
INCLUDE_OPT = INCLUDE_OPT = -I.. \
-I../port/$(PORTNAME) \ -I../port/$(PORTNAME) \
-I../../include -I../../include
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for utils # Makefile for utils
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.3 1996/11/03 09:28:31 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.4 1996/11/09 06:22:52 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,7 +12,6 @@ SRCDIR = ../.. ...@@ -12,7 +12,6 @@ SRCDIR = ../..
include ../../Makefile.global include ../../Makefile.global
INCLUDE_OPT = -I.. \ INCLUDE_OPT = -I.. \
-I../include \
-I../../include -I../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for utils/error # Makefile for utils/error
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.1 1996/10/27 09:53:33 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.2 1996/11/09 06:23:02 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -13,7 +13,6 @@ include ../../../Makefile.global ...@@ -13,7 +13,6 @@ include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \ -I../../port/$(PORTNAME) \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for utils/fmgr # Makefile for utils/fmgr
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.1 1996/10/27 09:53:40 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.2 1996/11/09 06:23:18 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -13,7 +13,6 @@ include ../../../Makefile.global ...@@ -13,7 +13,6 @@ include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \ -I../../port/$(PORTNAME) \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for utils/hash # Makefile for utils/hash
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.1 1996/10/27 09:53:48 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.2 1996/11/09 06:23:33 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -13,7 +13,6 @@ include ../../../Makefile.global ...@@ -13,7 +13,6 @@ include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \ -I../../port/$(PORTNAME) \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for utils/init # Makefile for utils/init
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.1 1996/10/27 09:54:01 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.2 1996/11/09 06:23:41 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -13,7 +13,6 @@ include ../../../Makefile.global ...@@ -13,7 +13,6 @@ include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \ -I../../port/$(PORTNAME) \
-I../../include \
-I../../../include -I../../../include
CFLAGS += $(INCLUDE_OPT) CFLAGS += $(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for utils/mmgr # Makefile for utils/mmgr
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.1 1996/10/27 09:54:06 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.2 1996/11/09 06:23:50 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -13,7 +13,6 @@ include ../../../Makefile.global ...@@ -13,7 +13,6 @@ include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \ -I../../port/$(PORTNAME) \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for utils/sort # Makefile for utils/sort
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.1 1996/10/27 09:54:15 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.2 1996/11/09 06:24:04 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -13,7 +13,6 @@ include ../../../Makefile.global ...@@ -13,7 +13,6 @@ include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \ -I../../port/$(PORTNAME) \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for utils/time # Makefile for utils/time
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.1 1996/10/27 09:54:25 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.2 1996/11/09 06:24:12 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -13,7 +13,6 @@ include ../../../Makefile.global ...@@ -13,7 +13,6 @@ include ../../../Makefile.global
INCLUDE_OPT = -I../.. \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \ -I../../port/$(PORTNAME) \
-I../../include \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -7,24 +7,23 @@ ...@@ -7,24 +7,23 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.8 1996/08/28 23:00:07 scrappy Exp $ # $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.9 1996/11/09 06:24:23 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
CFLAGS+= -I$(srcdir)/backend \ CFLAGS+= -I$(srcdir)/backend \
-I$(srcdir)/backend/include \ -I$(srcdir)/include \
-I$(srcdir)/libpq \ -I$(srcdir)/libpq
-I$(srcdir)/include
# #
# link with libpq, so we put it here. # link with libpq, so we put it here.
# #
LIBPQ:= -L$(srcdir)/libpq/$(objdir) -lpq LIBPQ:= -L$(srcdir)/libpq -lpq
LD_ADD+= $(LIBPQ) LD_ADD+= $(LIBPQ)
DPADD+= $(LIBPQ) DPADD+= $(LIBPQ)
# LIB_DEP is the list of dependencies on libraries for the link. # LIB_DEP is the list of dependencies on libraries for the link.
LIB_DEP+= $(srcdir)/libpq/$(objdir)/libpq.a LIB_DEP+= $(srcdir)/libpq/libpq.a
# #
# And where libpq goes, so goes the authentication stuff... # And where libpq goes, so goes the authentication stuff...
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.9 1996/11/08 06:01:27 momjian Exp $ # $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.10 1996/11/09 06:24:39 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -65,10 +65,10 @@ endif ...@@ -65,10 +65,10 @@ endif
all: psql all: psql
psql: $(OBJS) $(LIBPQDIR)/obj/libpq.a psql: $(OBJS) $(LIBPQDIR)/libpq.a
$(CC) $(LDFLAGS) -o psql -L$(LIBPQDIR)/obj $(OBJS) -lpq $(LD_ADD) $(CC) $(LDFLAGS) -o psql -L$(LIBPQDIR) $(OBJS) -lpq $(LD_ADD)
$(srcdir)/libpq/obj/libpq.a: $(srcdir)/libpq/libpq.a:
$(MAKE) -C $(LIBPQDIR) libpq.a $(MAKE) -C $(LIBPQDIR) libpq.a
install: install:
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.14 1996/11/08 21:40:11 momjian Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.15 1996/11/09 06:24:51 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -36,19 +36,19 @@ endif ...@@ -36,19 +36,19 @@ endif
shlib := shlib :=
ifdef LINUX_ELF ifdef LINUX_ELF
ifeq ($(PORTNAME), linux) ifeq ($(PORTNAME), linux)
shlib := obj/libpq.so.1 shlib := libpq.so.1
endif endif
endif endif
all: obj/libpq.a $(shlib) postgres.h c.h all: libpq.a $(shlib) postgres.h c.h
obj/libpq.a: $(OBJS) libpq.a: $(OBJS)
ifdef MK_NO_LORDER ifdef MK_NO_LORDER
$(AR) $(AROPT) obj/libpq.a $(OBJS) $(AR) $(AROPT) libpq.a $(OBJS)
else else
$(AR) $(AROPT) obj/libpq.a `lorder $(OBJS) | tsort` $(AR) $(AROPT) libpq.a `lorder $(OBJS) | tsort`
endif endif
$(RANLIB) obj/libpq.a $(RANLIB) libpq.a
fe-lobj.o:: ../backend/fmgr.h fe-lobj.o:: ../backend/fmgr.h
...@@ -61,8 +61,8 @@ fe-lobj.o:: ../backend/fmgr.h ...@@ -61,8 +61,8 @@ fe-lobj.o:: ../backend/fmgr.h
../backend/lib/dllist.o: ../backend/lib/dllist.o:
$(MAKE) -C ../backend/lib dllist.o $(MAKE) -C ../backend/lib dllist.o
obj/libpq.so.1: $(OBJS) libpq.so.1: $(OBJS)
$(CC) $(LDFLAGS) -shared $(OBJS) -o obj/libpq.so.1 $(CC) $(LDFLAGS) -shared $(OBJS) -o libpq.so.1
postgres.h: ../include/postgres.h postgres.h: ../include/postgres.h
# Note: ../backend/include/postgres.h needs to be named something different # Note: ../backend/include/postgres.h needs to be named something different
...@@ -128,17 +128,17 @@ install-shlib-dep := ...@@ -128,17 +128,17 @@ install-shlib-dep :=
endif endif
install-libpq: install-libpq:
$(INSTALL) $(INSTL_LIB_OPTS) obj/libpq.a $(DESTDIR)$(LIBDIR)/libpq.a $(INSTALL) $(INSTL_LIB_OPTS) libpq.a $(DESTDIR)$(LIBDIR)/libpq.a
install-shlib: install-shlib:
$(INSTALL) $(INSTL_LIB_OPTS) obj/libpq.so.1 $(DESTDIR)$(LIBDIR)/libpq.so.1 $(INSTALL) $(INSTL_LIB_OPTS) libpq.so.1 $(DESTDIR)$(LIBDIR)/libpq.so.1
depend dep: depend dep:
$(CC) -MM $(INCLUDE_OPT) *.c >depend $(CC) -MM $(INCLUDE_OPT) *.c >depend
.PHONY: clean .PHONY: clean
clean: clean:
rm -f obj/libpq.a obj/libpq.so.1 $(OBJS) c.h postgres.h rm -f libpq.a libpq.so.1 $(OBJS) c.h postgres.h
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment