Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita7143b3

Browse files
committed
Fix some makefiles that fail to yield good results from 'make -qp'.
This doesn't really matter for ordinary building of Postgres, but it'suseful for automated checks, such as my just-committed pgcheckdefines.
1 parent2d11d26 commita7143b3

File tree

6 files changed

+18
-22
lines changed

6 files changed

+18
-22
lines changed

‎contrib/mSQL-interface/Makefile

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#
2-
# $PostgreSQL: pgsql/contrib/mSQL-interface/Makefile,v 1.11 2005/12/09 21:19:34 petere Exp $
2+
# $PostgreSQL: pgsql/contrib/mSQL-interface/Makefile,v 1.12 2006/07/15 03:33:14 tgl Exp $
33
#
44

5-
NAME= mpgsql
5+
MODULE_big= mpgsql
66
SO_MAJOR_VERSION = 0
77
SO_MINOR_VERSION = 0
88
OBJS= mpgsql.o
9+
DOCS = README.mpgsql
910

1011
PG_CPPFLAGS = -I$(libpq_srcdir)
1112

@@ -18,17 +19,3 @@ top_builddir = ../..
1819
include$(top_builddir)/src/Makefile.global
1920
include$(top_srcdir)/contrib/contrib-global.mk
2021
endif
21-
22-
all: all-lib
23-
24-
install: all installdirs install-lib
25-
$(INSTALL_DATA)$(srcdir)/README.$(NAME)'$(DESTDIR)$(docdir)/contrib'
26-
27-
installdirs:
28-
$(mkinstalldirs)$(libdir)'$(DESTDIR)$(docdir)/contrib'
29-
30-
uninstall: uninstall-lib
31-
rm -f'$(DESTDIR)$(docdir)/contrib/README.$(NAME)'
32-
33-
cleandistcleanmaintainer-clean: clean-lib
34-
rm -f$(OBJS)

‎contrib/tsearch2/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.15 2006/05/31 14:05:31 teodor Exp $
1+
# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.16 2006/07/15 03:33:14 tgl Exp $
22

33
MODULE_big = tsearch2
44
OBJS = dict_ex.o dict.o snmap.o stopword.o common.o prs_dcfg.o\
@@ -37,6 +37,8 @@ endif
3737

3838
$(SUBDIROBJS):$(SUBDIRS:%=%-recursive) ;
3939

40+
.PHONY:$(SUBDIRS:%=%-recursive)
41+
4042
$(SUBDIRS:%=%-recursive):
4143
$(MAKE) -C $(subst -recursive,,$@) SUBSYS.o
4244

‎src/backend/port/nextstep/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
# Makefile for port/nextstep
55
#
66
# IDENTIFICATION
7-
# $PostgreSQL: pgsql/src/backend/port/nextstep/Makefile,v 1.8 2003/11/29 19:51:54 pgsql Exp $
7+
# $PostgreSQL: pgsql/src/backend/port/nextstep/Makefile,v 1.9 2006/07/15 03:33:14 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
subdir = src/backend/port/nextstep
1212
top_builddir = ../../../..
1313
include$(top_builddir)/src/Makefile.global
1414

15-
OBJS =dynloader.oport.o
15+
OBJS = port.o
1616

1717
all: SUBSYS.o
1818

‎src/backend/utils/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#
22
# Makefile for utils
33
#
4-
# $PostgreSQL: pgsql/src/backend/utils/Makefile,v 1.23 2004/07/17 03:29:15 tgl Exp $
4+
# $PostgreSQL: pgsql/src/backend/utils/Makefile,v 1.24 2006/07/15 03:33:14 tgl Exp $
55
#
66

7-
subdir = src/backend/utils/
7+
subdir = src/backend/utils
88
top_builddir = ../../..
99
include$(top_builddir)/src/Makefile.global
1010

‎src/bin/pgevent/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ subdir = src/bin/pgevent
1212
top_builddir = ../../..
1313
include$(top_builddir)/src/Makefile.global
1414

15+
ifeq ($(PORTNAME), win32)
16+
1517
OBJS=pgevent.o pgmsgevent.o
1618
NAME=pgevent.dll
1719

@@ -21,7 +23,7 @@ install: all install-lib
2123

2224
pgevent.dll:$(OBJS) pgevent.def
2325
dllwrap --def pgevent.def -o$(NAME)$(OBJS)
24-
26+
2527
pgmsgevent.o: pgmsgevent.rc win32ver.rc
2628
windres pgmsgevent.rc -o pgmsgevent.o --include-dir=$(top_builddir)/src/include
2729

@@ -38,3 +40,5 @@ clean distclean:
3840

3941
clean-lib:
4042
rm -f$(NAME)
43+
44+
endif

‎src/interfaces/ecpg/include/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ subdir = src/interfaces/ecpg/include
22
top_builddir = ../../../..
33
include$(top_builddir)/src/Makefile.global
44

5+
overrideCPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/ecpg/include\
6+
-I$(libpq_srcdir) -I$(top_builddir)/src/port$(CPPFLAGS)
7+
58
informix_esql_dir =$(pkgincludedir)/informix/esql
69

710
install: all installdirs install-headers

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp