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

Commit533d516

Browse files
committed
Removed MBFLAGS from makefiles since it's now done in include/config.h.
1 parentd4aab2c commit533d516

File tree

28 files changed

+81
-83
lines changed

28 files changed

+81
-83
lines changed

‎src/backend/access/common/Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/common
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.15 1999/12/13 22:32:20 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.16 2000/01/19 02:58:50 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../../Makefile.global
1313

1414
CFLAGS+=-I../..
1515

16-
ifdefMULTIBYTE
17-
CFLAGS+=$(MBFLAGS)
18-
endif
19-
2016
OBJS = heaptuple.o indextuple.o indexvalid.o printtup.o\
2117
scankey.o tupdesc.o
2218

‎src/backend/bootstrap/Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for the bootstrap module
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.20 2000/01/16 20:04:53 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.21 2000/01/19 02:58:51 petere Exp $
88
#
99
#
1010
# We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -22,9 +22,6 @@ SRCDIR= ../..
2222
include ../../Makefile.global
2323

2424
CFLAGS += -I..
25-
ifdefMULTIBYTE
26-
CFLAGS+=$(MBFLAGS)
27-
endif
2825

2926
ifeq ($(CC), gcc)
3027
CFLAGS+= -Wno-error

‎src/backend/commands/Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for commands
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.22 1999/12/13 22:32:38 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.23 2000/01/19 02:58:51 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../Makefile.global
1313

1414
CFLAGS += -I..
1515

16-
ifdefMULTIBYTE
17-
CFLAGS+=$(MBFLAGS)
18-
endif
19-
2016
OBJS = async.o creatinh.o command.o comment.o copy.o indexcmds.o define.o\
2117
remove.o rename.o vacuum.o view.o cluster.o\
2218
explain.o sequence.o trigger.o user.o proclang.o\

‎src/backend/libpq/Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for libpq subsystem (backend half of libpq interface)
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.16 1999/12/13 22:32:43 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.17 2000/01/19 02:58:52 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -19,10 +19,6 @@ CFLAGS+= $(KRBFLAGS)
1919
LDFLAGS+=$(KRBLIBS)
2020
endif
2121

22-
ifdefMULTIBYTE
23-
CFLAGS+=$(MBFLAGS)
24-
endif
25-
2622
OBJS = be-dumpdata.o be-fsstubs.o be-pqexec.o portal.o portalbuf.o\
2723
auth.o hba.o crypt.o password.o\
2824
pqcomm.o pqformat.o pqpacket.o pqsignal.o util.o

‎src/backend/parser/Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for parser
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.23 1999/12/13 22:33:03 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.24 2000/01/19 02:58:53 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -17,10 +17,6 @@ ifeq ($(CC), gcc)
1717
CFLAGS+= -Wno-error
1818
endif
1919

20-
ifdefMULTIBYTE
21-
CFLAGS+=$(MBFLAGS)
22-
endif
23-
2420
OBJS= analyze.o gram.o keywords.o parser.o parse_agg.o parse_clause.o\
2521
parse_expr.o parse_func.o parse_node.o parse_oper.o parse_relation.o\
2622
parse_type.o parse_coerce.o parse_target.o scan.o scansup.o

‎src/backend/regex/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for regex
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.11 1999/12/13 22:33:23 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.12 2000/01/19 02:58:53 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -19,7 +19,6 @@ DEBUGOBJ =
1919
OBJS = regcomp.o regerror.o regexec.o regfree.o
2020

2121
ifdefMULTIBYTE
22-
CFLAGS+=$(MBFLAGS)
2322
DEBUGOBJ += ../utils/mb/SUBSYS.o
2423
endif
2524

‎src/backend/regex/engine.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
*@(#)engine.c8.5 (Berkeley) 3/20/94
3838
*/
3939

40+
#include"postgres.h"
41+
4042
/*
4143
* The matching engine and friends. This file is #included by regexec.c
4244
* after suitable #defines of a variety of macros used herein, so that

‎src/backend/regex/regcomp.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ static char sccsid[] = "@(#)regcomp.c8.5 (Berkeley) 3/20/94";
4242

4343
#endif/* LIBC_SCCS and not lint */
4444

45+
#include"postgres.h"
46+
4547
#include<sys/types.h>
4648
#include<stdio.h>
4749
#include<string.h>

‎src/backend/regex/regerror.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ static char sccsid[] = "@(#)regerror.c8.4 (Berkeley) 3/20/94";
4242

4343
#endif/* LIBC_SCCS and not lint */
4444

45+
#include"postgres.h"
46+
4547
#include<sys/types.h>
4648
#include<stdio.h>
4749
#include<string.h>

‎src/backend/regex/regexec.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ static char sccsid[] = "@(#)regexec.c8.3 (Berkeley) 3/20/94";
4242

4343
#endif/* LIBC_SCCS and not lint */
4444

45+
#include"postgres.h"
46+
4547
/*
4648
* the outer shell of regexec()
4749
*

‎src/backend/regex/regfree.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ static char sccsid[] = "@(#)regfree.c8.3 (Berkeley) 3/20/94";
4242

4343
#endif/* LIBC_SCCS and not lint */
4444

45+
#include"postgres.h"
46+
4547
#include<sys/types.h>
4648
#include<stdio.h>
4749
#include<stdlib.h>

‎src/backend/rewrite/Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@
44
# Makefile for rewrite
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.10 1999/12/13 22:33:28 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.11 2000/01/19 02:58:54 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../..
1212
include ../../Makefile.global
1313

1414
CFLAGS += -I..
15-
ifdefMULTIBYTE
16-
CFLAGS+=$(MBFLAGS)
17-
endif
1815

1916
OBJS = rewriteRemove.o rewriteDefine.o\
2017
rewriteHandler.o rewriteManip.o rewriteSupport.o locks.o

‎src/backend/storage/lmgr/Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@
44
# Makefile for storage/lmgr
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.11 1999/12/13 22:33:54momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.12 2000/01/19 02:58:54petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

1414
CFLAGS += -I../..
15-
ifdefMULTIBYTE
16-
CFLAGS+=$(MBFLAGS)
17-
endif
1815

1916
OBJS = lmgr.o lock.o proc.o
2017

‎src/backend/storage/smgr/Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for storage/smgr
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.10 1999/12/13 22:34:09 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.11 2000/01/19 02:58:55 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../../Makefile.global
1313

1414
CFLAGS += -I../..
1515

16-
ifdefMULTIBYTE
17-
CFLAGS+=$(MBFLAGS)
18-
endif
19-
2016
OBJS = md.o mm.o smgr.o smgrtype.o
2117

2218
all: SUBSYS.o

‎src/backend/tcop/Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for tcop
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.20 1999/12/13 22:34:16 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.21 2000/01/19 02:58:56 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../Makefile.global
1313

1414
CFLAGS+= -I..
1515

16-
ifdefMULTIBYTE
17-
CFLAGS+=$(MBFLAGS)
18-
endif
19-
2016
ifeq ($(CC), gcc)
2117
CFLAGS+= -Wno-error
2218
endif

‎src/backend/utils/adt/Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for utils/adt
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.31 2000/01/07 17:22:47 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.32 2000/01/19 02:58:56 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -23,10 +23,6 @@ CFLAGS+= -mieee
2323
endif
2424
endif
2525

26-
ifdefMULTIBYTE
27-
CFLAGS+=$(MBFLAGS)
28-
endif
29-
3026
OBJS = acl.o arrayfuncs.o arrayutils.o bool.o cash.o char.o chunk.o\
3127
date.o datetime.o datum.o dt.o filename.o float.o\
3228
geo_ops.o geo_selfuncs.o int.o int8.o like.o\

‎src/backend/utils/init/Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@
44
# Makefile for utils/init
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.11 1999/12/13 22:34:53 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.12 2000/01/19 02:58:57 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

1414
CFLAGS += -I../..
15-
ifdefMULTIBYTE
16-
CFLAGS+=$(MBFLAGS)
17-
endif
1815

1916
OBJS = enbl.o findbe.o globals.o miscinit.o postinit.o
2017

‎src/backend/utils/mb/Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@
44
# Makefile for utils/mb
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.6 2000/01/13 01:08:14 ishii Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.7 2000/01/19 02:58:57 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

1414
CFLAGS += -I../..
15-
ifdefMULTIBYTE
16-
CFLAGS+=$(MBFLAGS)
17-
endif
1815

1916
OBJS = common.o conv.o mbutils.o wchar.o wstrcmp.o wstrncmp.o variable.o\
2017
big5.o

‎src/backend/utils/misc/Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for utils/misc
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.11 1999/12/13 22:35:01 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.12 2000/01/19 02:58:58 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,10 +13,6 @@ include ../../../Makefile.global
1313

1414
CFLAGS += -I../..
1515

16-
ifdefMULTIBYTE
17-
CFLAGS+=$(MBFLAGS)
18-
endif
19-
2016
OBJS = database.o superuser.o trace.o
2117

2218
all: SUBSYS.o

‎src/bin/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.22 1999/12/22 04:12:54 ishii Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.23 2000/01/19 02:58:59 petere Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ..
1515
include ../Makefile.global
1616

17-
DIRS =pg_idpg_version psql pg_dump pg_passwd\
17+
DIRS = pg_version psql pg_dump pg_passwd\
1818
scripts initdb initlocation ipcclean\
1919
pg_ctl
2020

‎src/bin/pg_dump/pg_dump.c

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
*
2323
* IDENTIFICATION
24-
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.135 2000/01/18 18:09:02 momjian Exp $
24+
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.136 2000/01/19 02:58:59 petere Exp $
2525
*
2626
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
2727
*
@@ -608,9 +608,9 @@ main(int argc, char **argv)
608608
*/
609609

610610
#ifdefHAVE_GETOPT_LONG
611-
while ((c=getopt_long(argc,argv,"acdDh:nNoOp:st:uvxzV?\037",long_options,&optindex))!=-1)
611+
while ((c=getopt_long(argc,argv,"acdDf:h:nNoOp:st:uvxzV?\037",long_options,&optindex))!=-1)
612612
#else
613-
while ((c=getopt(argc,argv,"acdDh:nNoOp:st:uvxzV?"))!=-1)
613+
while ((c=getopt(argc,argv,"acdDf:h:nNoOp:st:uvxzV?-"))!=-1)
614614
#endif
615615
{
616616
switch (c)
@@ -630,6 +630,10 @@ main(int argc, char **argv)
630630
dumpData= true;
631631
attrNames= true;
632632
break;
633+
case'f':
634+
fprintf(stderr,"%s: The -f option is obsolete. You can achieve the same by writing %s > %s.\n",
635+
progname,progname,optarg);
636+
exit(1);
633637
case'\037':/* output file name, see note above */
634638
filename=optarg;
635639
break;
@@ -695,9 +699,26 @@ main(int argc, char **argv)
695699
exit(0);
696700
break;
697701
case'?':
698-
help(progname);
699-
exit(0);
702+
/* getopt returns '?' on unknown argument. That's not
703+
quite what we want */
704+
if (strcmp(argv[optind-1],"-?")==0)
705+
{
706+
help(progname);
707+
exit(1);
708+
}
709+
else
710+
{
711+
fputs("Try -? for help.\n",stderr);
712+
exit(1);
713+
}
700714
break;
715+
#ifndefHAVE_GETOPT_LONG
716+
case'-':
717+
fprintf(stderr,"%s was compiled without support for long options.\n"
718+
"Use -? for help on invocation options.\n",progname);
719+
exit(1);
720+
break;
721+
#endif
701722
default:
702723
fprintf(stderr,"%s: unknown option -%c\nTry -? for help.\n",progname,c);
703724
exit(1);

0 commit comments

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