mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove a few $filter() calls that were not needed.

Browse Source
This commit is contained in:
Bruce Momjian 2004-05-24 01:01:38 +00:00
parent 17edb84056
commit 82695df3b7
7 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/initdb/Makefile
View File

@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.40 2004/05/19 17:15:20 momjian Exp $ # $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.41 2004/05/24 01:01:37 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -15,8 +15,7 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS) override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
OBJS= initdb.o \ OBJS= initdb.o exec.o
$(filter exec.o, $(LIBOBJS))
all: submake-libpq submake-libpgport initdb all: submake-libpq submake-libpgport initdb

4
src/bin/pg_dump/Makefile
View File

@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.50 2004/05/22 02:14:28 tgl Exp $ # $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.51 2004/05/24 01:01:37 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -18,7 +18,7 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND
OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \ OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
pg_backup_files.o pg_backup_null.o pg_backup_tar.o \ pg_backup_files.o pg_backup_null.o pg_backup_tar.o \
dumputils.o dumputils.o
PG_DUMPALL_OBJS = $(filter exec.o, $(LIBOBJS)) PG_DUMPALL_OBJS = exec.o
EXTRA_OBJS = $(top_builddir)/src/backend/parser/keywords.o EXTRA_OBJS = $(top_builddir)/src/backend/parser/keywords.o

5
src/bin/pg_resetxlog/Makefile
View File

@ -4,7 +4,7 @@
# #
# Copyright (c) 1998-2002, PostgreSQL Global Development Group # Copyright (c) 1998-2002, PostgreSQL Global Development Group
# #
# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.8 2004/04/30 20:01:39 momjian Exp $ # $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.9 2004/05/24 01:01:37 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -14,8 +14,7 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS += -DFRONTEND override CPPFLAGS += -DFRONTEND
OBJS= pg_resetxlog.o pg_crc.o \ OBJS= pg_resetxlog.o pg_crc.o dirmod.o
$(filter dirmod.o, $(LIBOBJS))
all: submake-libpgport pg_resetxlog all: submake-libpgport pg_resetxlog

5
src/bin/psql/Makefile
View File

@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.46 2004/05/19 17:15:21 momjian Exp $ # $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.47 2004/05/24 01:01:37 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -19,8 +19,7 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND
OBJS= command.o common.o help.o input.o stringutils.o mainloop.o copy.o \ OBJS= command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
startup.o prompt.o variables.o large_obj.o print.o describe.o \ startup.o prompt.o variables.o large_obj.o print.o describe.o \
psqlscan.o tab-complete.o mbprint.o \ psqlscan.o tab-complete.o mbprint.o exec.o
$(filter exec.o, $(LIBOBJS))
FLEXFLAGS = -Cfe FLEXFLAGS = -Cfe

5
src/interfaces/ecpg/pgtypeslib/Makefile
View File

@ -4,7 +4,7 @@
# #
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.19 2004/05/07 13:42:48 meskes Exp $ # $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.20 2004/05/24 01:01:38 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -23,7 +23,8 @@ override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include \
SHLIB_LINK += -lm SHLIB_LINK += -lm
OBJS= numeric.o datetime.o common.o dt_common.o timestamp.o interval.o \ OBJS= numeric.o datetime.o common.o dt_common.o timestamp.o interval.o \
$(filter rint.o, $(LIBOBJS)) $(filter pgstrcasecmp.o, $(LIBOBJS)) pgstrcasecmp.o \
$(filter rint.o, $(LIBOBJS))
all: all-lib all: all-lib

4
src/interfaces/ecpg/preproc/Makefile
View File

@ -1,4 +1,4 @@
# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.106 2004/05/19 17:15:21 momjian Exp $ # $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.107 2004/05/24 01:01:38 momjian Exp $
subdir = src/interfaces/ecpg/preproc subdir = src/interfaces/ecpg/preproc
top_builddir = ../../../.. top_builddir = ../../../..
@ -20,7 +20,7 @@ override CFLAGS += $(PTHREAD_CFLAGS)
OBJS= preproc.o type.o ecpg.o ecpg_keywords.o output.o\ OBJS= preproc.o type.o ecpg.o ecpg_keywords.o output.o\
keywords.o c_keywords.o ../ecpglib/typename.o descriptor.o variable.o \ keywords.o c_keywords.o ../ecpglib/typename.o descriptor.o variable.o \
$(filter exec.o, $(LIBOBJS)) exec.o
all: submake-libpgport ecpg all: submake-libpgport ecpg

6
src/interfaces/libpq/Makefile
View File

@ -4,7 +4,7 @@
# #
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.108 2004/05/21 20:56:49 tgl Exp $ # $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.109 2004/05/24 01:01:38 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -23,8 +23,8 @@ override CFLAGS += $(PTHREAD_CFLAGS)
OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \ OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o \ fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o \
dllist.o md5.o ip.o wchar.o encnames.o \ dllist.o md5.o ip.o wchar.o encnames.o noblock.o pgstrcasecmp.o thread.o \
$(filter crypt.o getaddrinfo.o inet_aton.o noblock.o pgstrcasecmp.o snprintf.o strerror.o open.o thread.o, $(LIBOBJS)) $(filter crypt.o getaddrinfo.o inet_aton.o open.o snprintf.o strerror.o, $(LIBOBJS))
ifeq ($(PORTNAME), win32) ifeq ($(PORTNAME), win32)
OBJS+=win32.o OBJS+=win32.o
endif endif