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

diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index 0af6ae798eae57e32cbb2ba69bbe6bc5d16c26cc..82f3a8ba41ba7943e527fbf0bea5452ba702f66b 100644 (file)
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
 # 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)
 
-OBJS=  initdb.o \
-       $(filter exec.o, $(LIBOBJS))
+OBJS=  initdb.o exec.o
 
 all: submake-libpq submake-libpgport initdb
 

diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index ae5533bba35f5a6fe905de144322ff383da1d32f..035e4a4275a61f99e8d4f8a55e2d98a7da469b81 100644 (file)
--- a/src/bin/pg_dump/Makefile
+++ b/src/bin/pg_dump/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # 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 \
        pg_backup_files.o pg_backup_null.o pg_backup_tar.o \
        dumputils.o
-PG_DUMPALL_OBJS = $(filter exec.o, $(LIBOBJS))
+PG_DUMPALL_OBJS = exec.o
 
 EXTRA_OBJS = $(top_builddir)/src/backend/parser/keywords.o
 

diff --git a/src/bin/pg_resetxlog/Makefile b/src/bin/pg_resetxlog/Makefile
index e59217ba68eb501ec714ab946784b916bb321c21..abbeea65c7f793d447f3242bd3a475a213146286 100644 (file)
--- a/src/bin/pg_resetxlog/Makefile
+++ b/src/bin/pg_resetxlog/Makefile
@@ -4,7 +4,7 @@
 #
 # 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
 
-OBJS= pg_resetxlog.o pg_crc.o \
-      $(filter dirmod.o, $(LIBOBJS))
+OBJS= pg_resetxlog.o pg_crc.o dirmod.o
 
 all: submake-libpgport pg_resetxlog
 

diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index c61b6e0bb995cd2cf6fae4efb937d143a644b2ae..08dbe25d8d31b883666edf0d47423126fdb8dcb0 100644 (file)
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # 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 \
        startup.o prompt.o variables.o large_obj.o print.o describe.o \
-       psqlscan.o tab-complete.o mbprint.o \
-       $(filter exec.o, $(LIBOBJS))
+       psqlscan.o tab-complete.o mbprint.o exec.o
 
 FLEXFLAGS = -Cfe
 

diff --git a/src/interfaces/ecpg/pgtypeslib/Makefile b/src/interfaces/ecpg/pgtypeslib/Makefile
index fa02e09485a6b56bcf76f1c2dda7664fc6eb92d8..14d31a44d8b36850ef773e5e4be552e5a91f79e5 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/Makefile
+++ b/src/interfaces/ecpg/pgtypeslib/Makefile
@@ -4,7 +4,7 @@
 #
 # 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
 
 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
 

diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
index 806a7dd925dffec70f81cc752daaa676fa86307c..53aaa87db54c25d3e335ced5d1f8187ebfa2ff8c 100644 (file)
--- a/src/interfaces/ecpg/preproc/Makefile
+++ b/src/interfaces/ecpg/preproc/Makefile
@@ -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
 top_builddir = ../../../..
@@ -20,7 +20,7 @@ override CFLAGS += $(PTHREAD_CFLAGS)
 
 OBJS=  preproc.o type.o ecpg.o ecpg_keywords.o output.o\
        keywords.o c_keywords.o ../ecpglib/typename.o descriptor.o variable.o \
-       $(filter exec.o, $(LIBOBJS))
+       exec.o
 
 all: submake-libpgport ecpg
 

diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 352f61107be5ca2372c933173e85ea5fb4c0128c..f655ba7f6535aa928025a823a52da1ef8b948b25 100644 (file)
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -4,7 +4,7 @@
 #
 # 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 \
        fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o \
-       dllist.o md5.o ip.o wchar.o encnames.o \
-       $(filter crypt.o getaddrinfo.o inet_aton.o noblock.o pgstrcasecmp.o snprintf.o strerror.o open.o thread.o, $(LIBOBJS))
+       dllist.o md5.o ip.o wchar.o encnames.o noblock.o pgstrcasecmp.o thread.o \
+       $(filter crypt.o getaddrinfo.o inet_aton.o open.o snprintf.o strerror.o, $(LIBOBJS))
 ifeq ($(PORTNAME), win32)
 OBJS+=win32.o
 endif