aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2006-07-15 03:33:14 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2006-07-15 03:33:14 +0000
commita7143b3088aef0f82aa299aecdad8462ff74d23a (patch)
tree9b7a36b6b83890b9d7b9026994bfe5faa6182533 /src
parent2d11d26113dd88072e09f92ad3f2032a27e4d8ce (diff)
downloadpostgresql-a7143b3088aef0f82aa299aecdad8462ff74d23a.tar.gz
postgresql-a7143b3088aef0f82aa299aecdad8462ff74d23a.zip
Fix some makefiles that fail to yield good results from 'make -qp'.
This doesn't really matter for ordinary building of Postgres, but it's useful for automated checks, such as my just-committed pgcheckdefines.
Diffstat (limited to 'src')
-rw-r--r--src/backend/port/nextstep/Makefile4
-rw-r--r--src/backend/utils/Makefile4
-rw-r--r--src/bin/pgevent/Makefile6
-rw-r--r--src/interfaces/ecpg/include/Makefile3
4 files changed, 12 insertions, 5 deletions
diff --git a/src/backend/port/nextstep/Makefile b/src/backend/port/nextstep/Makefile
index 7b65e7b84b3..efca19dc87b 100644
--- a/src/backend/port/nextstep/Makefile
+++ b/src/backend/port/nextstep/Makefile
@@ -4,7 +4,7 @@
# Makefile for port/nextstep
#
# IDENTIFICATION
-# $PostgreSQL: pgsql/src/backend/port/nextstep/Makefile,v 1.8 2003/11/29 19:51:54 pgsql Exp $
+# $PostgreSQL: pgsql/src/backend/port/nextstep/Makefile,v 1.9 2006/07/15 03:33:14 tgl Exp $
#
#-------------------------------------------------------------------------
@@ -12,7 +12,7 @@ subdir = src/backend/port/nextstep
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
-OBJS = dynloader.o port.o
+OBJS = port.o
all: SUBSYS.o
diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile
index d48db1e8188..5c3c20b815d 100644
--- a/src/backend/utils/Makefile
+++ b/src/backend/utils/Makefile
@@ -1,10 +1,10 @@
#
# Makefile for utils
#
-# $PostgreSQL: pgsql/src/backend/utils/Makefile,v 1.23 2004/07/17 03:29:15 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/utils/Makefile,v 1.24 2006/07/15 03:33:14 tgl Exp $
#
-subdir = src/backend/utils/
+subdir = src/backend/utils
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
diff --git a/src/bin/pgevent/Makefile b/src/bin/pgevent/Makefile
index 23a4d9ce3e9..42460a98822 100644
--- a/src/bin/pgevent/Makefile
+++ b/src/bin/pgevent/Makefile
@@ -12,6 +12,8 @@ subdir = src/bin/pgevent
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
+ifeq ($(PORTNAME), win32)
+
OBJS=pgevent.o pgmsgevent.o
NAME=pgevent.dll
@@ -21,7 +23,7 @@ install: all install-lib
pgevent.dll: $(OBJS) pgevent.def
dllwrap --def pgevent.def -o $(NAME) $(OBJS)
-
+
pgmsgevent.o: pgmsgevent.rc win32ver.rc
windres pgmsgevent.rc -o pgmsgevent.o --include-dir=$(top_builddir)/src/include
@@ -38,3 +40,5 @@ clean distclean:
clean-lib:
rm -f $(NAME)
+
+endif
diff --git a/src/interfaces/ecpg/include/Makefile b/src/interfaces/ecpg/include/Makefile
index 9090be13cdd..1b5b1413115 100644
--- a/src/interfaces/ecpg/include/Makefile
+++ b/src/interfaces/ecpg/include/Makefile
@@ -2,6 +2,9 @@ subdir = src/interfaces/ecpg/include
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
+override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/ecpg/include \
+ -I$(libpq_srcdir) -I$(top_builddir)/src/port $(CPPFLAGS)
+
informix_esql_dir = $(pkgincludedir)/informix/esql
install: all installdirs install-headers