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

Commit82695df

Browse files
committed
Remove a few $filter() calls that were not needed.
1 parent17edb84 commit82695df

File tree

7 files changed

+16
-18
lines changed

7 files changed

+16
-18
lines changed

‎src/bin/initdb/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.40 2004/05/19 17:15:20 momjian Exp $
8+
# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.41 2004/05/24 01:01:37 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -15,8 +15,7 @@ include $(top_builddir)/src/Makefile.global
1515

1616
overrideCPPFLAGS := -DFRONTEND -I$(libpq_srcdir)$(CPPFLAGS)
1717

18-
OBJS=initdb.o\
19-
$(filter exec.o,$(LIBOBJS))
18+
OBJS=initdb.o exec.o
2019

2120
all: submake-libpq submake-libpgport initdb
2221

‎src/bin/pg_dump/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.50 2004/05/22 02:14:28 tgl Exp $
8+
# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.51 2004/05/24 01:01:37 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -18,7 +18,7 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND
1818
OBJS=pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o\
1919
pg_backup_files.o pg_backup_null.o pg_backup_tar.o\
2020
dumputils.o
21-
PG_DUMPALL_OBJS =$(filterexec.o,$(LIBOBJS))
21+
PG_DUMPALL_OBJS = exec.o
2222

2323
EXTRA_OBJS =$(top_builddir)/src/backend/parser/keywords.o
2424

‎src/bin/pg_resetxlog/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1998-2002, PostgreSQL Global Development Group
66
#
7-
# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.8 2004/04/30 20:01:39 momjian Exp $
7+
# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.9 2004/05/24 01:01:37 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -14,8 +14,7 @@ include $(top_builddir)/src/Makefile.global
1414

1515
overrideCPPFLAGS += -DFRONTEND
1616

17-
OBJS= pg_resetxlog.o pg_crc.o\
18-
$(filter dirmod.o,$(LIBOBJS))
17+
OBJS= pg_resetxlog.o pg_crc.o dirmod.o
1918

2019
all: submake-libpgport pg_resetxlog
2120

‎src/bin/psql/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.46 2004/05/19 17:15:21 momjian Exp $
8+
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.47 2004/05/24 01:01:37 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -19,8 +19,7 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND
1919

2020
OBJS=command.o common.o help.o input.o stringutils.o mainloop.o copy.o\
2121
startup.o prompt.o variables.o large_obj.o print.o describe.o\
22-
psqlscan.o tab-complete.o mbprint.o\
23-
$(filter exec.o,$(LIBOBJS))
22+
psqlscan.o tab-complete.o mbprint.o exec.o
2423

2524
FLEXFLAGS = -Cfe
2625

‎src/interfaces/ecpg/pgtypeslib/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.19 2004/05/07 13:42:48 meskes Exp $
7+
# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.20 2004/05/24 01:01:38 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -23,7 +23,8 @@ override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include \
2323
SHLIB_LINK += -lm
2424

2525
OBJS= numeric.o datetime.o common.o dt_common.o timestamp.o interval.o\
26-
$(filter rint.o,$(LIBOBJS))$(filter pgstrcasecmp.o,$(LIBOBJS))
26+
pgstrcasecmp.o\
27+
$(filter rint.o,$(LIBOBJS))
2728

2829
all: all-lib
2930

‎src/interfaces/ecpg/preproc/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.106 2004/05/19 17:15:21 momjian Exp $
1+
# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.107 2004/05/24 01:01:38 momjian Exp $
22

33
subdir = src/interfaces/ecpg/preproc
44
top_builddir = ../../../..
@@ -20,7 +20,7 @@ override CFLAGS += $(PTHREAD_CFLAGS)
2020

2121
OBJS=preproc.o type.o ecpg.o ecpg_keywords.o output.o\
2222
keywords.o c_keywords.o ../ecpglib/typename.o descriptor.o variable.o\
23-
$(filterexec.o,$(LIBOBJS))
23+
exec.o
2424

2525
all: submake-libpgport ecpg
2626

‎src/interfaces/libpq/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.108 2004/05/21 20:56:49 tgl Exp $
7+
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.109 2004/05/24 01:01:38 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -23,8 +23,8 @@ override CFLAGS += $(PTHREAD_CFLAGS)
2323

2424
OBJS=fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o\
2525
fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o\
26-
dllist.o md5.o ip.o wchar.o encnames.o\
27-
$(filter crypt.o getaddrinfo.o inet_aton.onoblock.opgstrcasecmp.osnprintf.o strerror.o open.o thread.o,$(LIBOBJS))
26+
dllist.o md5.o ip.o wchar.o encnames.onoblock.o pgstrcasecmp.o thread.o\
27+
$(filter crypt.o getaddrinfo.o inet_aton.oopen.o snprintf.o strerror.o,$(LIBOBJS))
2828
ifeq ($(PORTNAME), win32)
2929
OBJS+=win32.o
3030
endif

0 commit comments

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