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

Avoid MSVC breakage caused by my previous commit by not using a variable in

Browse Source 
the src/bin/scripts Makefile.
This commit is contained in:
Alvaro Herrera 2009-03-07 02:09:22 +00:00
parent 328d235571
commit 54fd95b293
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/bin/scripts/Makefile
View File

@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2009, 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/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) %: %.o $(WIN32RES)
$(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LIBS) -o $@$(X) $(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LIBS) -o $@$(X)
DUMPUTILSOBJS = dumputils.o kwlookup.o keywords.o createdb: createdb.o common.o dumputils.o kwlookup.o keywords.o
createdb: createdb.o common.o $(DUMPUTILSOBJS)
createlang: createlang.o common.o print.o mbprint.o createlang: createlang.o common.o print.o mbprint.o
createuser: createuser.o common.o $(DUMPUTILSOBJS) createuser: createuser.o common.o dumputils.o kwlookup.o keywords.o
dropdb: dropdb.o common.o $(DUMPUTILSOBJS) dropdb: dropdb.o common.o dumputils.o kwlookup.o keywords.o
droplang: droplang.o common.o print.o mbprint.o droplang: droplang.o common.o print.o mbprint.o
dropuser: dropuser.o common.o $(DUMPUTILSOBJS) dropuser: dropuser.o common.o dumputils.o kwlookup.o keywords.o
clusterdb: clusterdb.o common.o $(DUMPUTILSOBJS) clusterdb: clusterdb.o common.o dumputils.o kwlookup.o keywords.o
vacuumdb: vacuumdb.o common.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/% dumputils.c keywords.c: % : $(top_srcdir)/src/bin/pg_dump/%
rm -f $@ && $(LN_S) $< . rm -f $@ && $(LN_S) $< .
@ -64,5 +62,5 @@ uninstall:
clean distclean maintainer-clean: clean distclean maintainer-clean:
rm -f $(addsuffix $(X), $(PROGRAMS)) $(addsuffix .o, $(PROGRAMS)) 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 rm -f dumputils.c print.c mbprint.c kwlookup.c keywords.c