Commit a7143b30 authored by Tom Lane's avatar Tom Lane

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.
parent 2d11d261
# #
# $PostgreSQL: pgsql/contrib/mSQL-interface/Makefile,v 1.11 2005/12/09 21:19:34 petere Exp $ # $PostgreSQL: pgsql/contrib/mSQL-interface/Makefile,v 1.12 2006/07/15 03:33:14 tgl Exp $
# #
NAME = mpgsql MODULE_big = mpgsql
SO_MAJOR_VERSION = 0 SO_MAJOR_VERSION = 0
SO_MINOR_VERSION = 0 SO_MINOR_VERSION = 0
OBJS = mpgsql.o OBJS = mpgsql.o
DOCS = README.mpgsql
PG_CPPFLAGS = -I$(libpq_srcdir) PG_CPPFLAGS = -I$(libpq_srcdir)
...@@ -18,17 +19,3 @@ top_builddir = ../.. ...@@ -18,17 +19,3 @@ top_builddir = ../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk include $(top_srcdir)/contrib/contrib-global.mk
endif endif
all: all-lib
install: all installdirs install-lib
$(INSTALL_DATA) $(srcdir)/README.$(NAME) '$(DESTDIR)$(docdir)/contrib'
installdirs:
$(mkinstalldirs) $(libdir) '$(DESTDIR)$(docdir)/contrib'
uninstall: uninstall-lib
rm -f '$(DESTDIR)$(docdir)/contrib/README.$(NAME)'
clean distclean maintainer-clean: clean-lib
rm -f $(OBJS)
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.15 2006/05/31 14:05:31 teodor Exp $ # $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.16 2006/07/15 03:33:14 tgl Exp $
MODULE_big = tsearch2 MODULE_big = tsearch2
OBJS = dict_ex.o dict.o snmap.o stopword.o common.o prs_dcfg.o \ OBJS = dict_ex.o dict.o snmap.o stopword.o common.o prs_dcfg.o \
...@@ -37,6 +37,8 @@ endif ...@@ -37,6 +37,8 @@ endif
$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ; $(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
.PHONY: $(SUBDIRS:%=%-recursive)
$(SUBDIRS:%=%-recursive): $(SUBDIRS:%=%-recursive):
$(MAKE) -C $(subst -recursive,,$@) SUBSYS.o $(MAKE) -C $(subst -recursive,,$@) SUBSYS.o
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for port/nextstep # Makefile for port/nextstep
# #
# IDENTIFICATION # 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 ...@@ -12,7 +12,7 @@ subdir = src/backend/port/nextstep
top_builddir = ../../../.. top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
OBJS = dynloader.o port.o OBJS = port.o
all: SUBSYS.o all: SUBSYS.o
......
# #
# Makefile for utils # 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 = ../../.. top_builddir = ../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
......
...@@ -12,6 +12,8 @@ subdir = src/bin/pgevent ...@@ -12,6 +12,8 @@ subdir = src/bin/pgevent
top_builddir = ../../.. top_builddir = ../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
ifeq ($(PORTNAME), win32)
OBJS=pgevent.o pgmsgevent.o OBJS=pgevent.o pgmsgevent.o
NAME=pgevent.dll NAME=pgevent.dll
...@@ -21,7 +23,7 @@ install: all install-lib ...@@ -21,7 +23,7 @@ install: all install-lib
pgevent.dll: $(OBJS) pgevent.def pgevent.dll: $(OBJS) pgevent.def
dllwrap --def pgevent.def -o $(NAME) $(OBJS) dllwrap --def pgevent.def -o $(NAME) $(OBJS)
pgmsgevent.o: pgmsgevent.rc win32ver.rc pgmsgevent.o: pgmsgevent.rc win32ver.rc
windres pgmsgevent.rc -o pgmsgevent.o --include-dir=$(top_builddir)/src/include windres pgmsgevent.rc -o pgmsgevent.o --include-dir=$(top_builddir)/src/include
...@@ -38,3 +40,5 @@ clean distclean: ...@@ -38,3 +40,5 @@ clean distclean:
clean-lib: clean-lib:
rm -f $(NAME) rm -f $(NAME)
endif
...@@ -2,6 +2,9 @@ subdir = src/interfaces/ecpg/include ...@@ -2,6 +2,9 @@ subdir = src/interfaces/ecpg/include
top_builddir = ../../../.. top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global 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 informix_esql_dir = $(pkgincludedir)/informix/esql
install: all installdirs install-headers install: all installdirs install-headers
......
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