diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2009-03-07 02:09:22 +0000 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2009-03-07 02:09:22 +0000 |
| commit | 54fd95b29395d57bd31562fc750233ee4691f73b (patch) | |
| tree | e58b2303603e34d220e586b381215b09c4f1199f | |
| parent | 328d235571616669273979dd1b4c7ace018efc0b (diff) | |
| download | postgresql-54fd95b29395d57bd31562fc750233ee4691f73b.tar.gz postgresql-54fd95b29395d57bd31562fc750233ee4691f73b.zip | |
Avoid MSVC breakage caused by my previous commit by not using a variable in
the src/bin/scripts Makefile.
| -rw-r--r-- | src/bin/scripts/Makefile | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile index e353d86de83..44cada79e58 100644 --- a/src/bin/scripts/Makefile +++ b/src/bin/scripts/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.41 2009/03/07 00:13:58 alvherre Exp $ +# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.42 2009/03/07 02:09:22 alvherre Exp $ # #------------------------------------------------------------------------- @@ -23,17 +23,15 @@ all: submake-libpq $(PROGRAMS) %: %.o $(WIN32RES) $(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LIBS) -o $@$(X) -DUMPUTILSOBJS = dumputils.o kwlookup.o keywords.o - -createdb: createdb.o common.o $(DUMPUTILSOBJS) +createdb: createdb.o common.o dumputils.o kwlookup.o keywords.o createlang: createlang.o common.o print.o mbprint.o -createuser: createuser.o common.o $(DUMPUTILSOBJS) -dropdb: dropdb.o common.o $(DUMPUTILSOBJS) +createuser: createuser.o common.o dumputils.o kwlookup.o keywords.o +dropdb: dropdb.o common.o dumputils.o kwlookup.o keywords.o droplang: droplang.o common.o print.o mbprint.o -dropuser: dropuser.o common.o $(DUMPUTILSOBJS) -clusterdb: clusterdb.o common.o $(DUMPUTILSOBJS) +dropuser: dropuser.o common.o dumputils.o kwlookup.o keywords.o +clusterdb: clusterdb.o common.o dumputils.o kwlookup.o keywords.o vacuumdb: vacuumdb.o common.o -reindexdb: reindexdb.o common.o $(DUMPUTILSOBJS) +reindexdb: reindexdb.o common.o dumputils.o kwlookup.o keywords.o dumputils.c keywords.c: % : $(top_srcdir)/src/bin/pg_dump/% rm -f $@ && $(LN_S) $< . @@ -64,5 +62,5 @@ uninstall: clean distclean maintainer-clean: rm -f $(addsuffix $(X), $(PROGRAMS)) $(addsuffix .o, $(PROGRAMS)) - rm -f common.o $(DUMPUTILSOBJS) print.o mbprint.o $(WIN32RES) + rm -f common.o dumputils.o kwlookup.o keywords.o print.o mbprint.o $(WIN32RES) rm -f dumputils.c print.c mbprint.c kwlookup.c keywords.c |