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

Commit54fd95b

Browse files
committed
Avoid MSVC breakage caused by my previous commit by not using a variable in
the src/bin/scripts Makefile.
1 parent328d235 commit54fd95b

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

‎src/bin/scripts/Makefile

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.41 2009/03/0700:13:58 alvherre Exp $
8+
# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.42 2009/03/0702:09:22 alvherre Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -23,17 +23,15 @@ all: submake-libpq $(PROGRAMS)
2323
%: %.o $(WIN32RES)
2424
$(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LIBS) -o $@$(X)
2525

26-
DUMPUTILSOBJS = dumputils.o kwlookup.o keywords.o
27-
28-
createdb: createdb.o common.o $(DUMPUTILSOBJS)
26+
createdb: createdb.o common.o dumputils.o kwlookup.o keywords.o
2927
createlang: createlang.o common.o print.o mbprint.o
30-
createuser: createuser.o common.o$(DUMPUTILSOBJS)
31-
dropdb: dropdb.o common.o$(DUMPUTILSOBJS)
28+
createuser: createuser.o common.odumputils.o kwlookup.o keywords.o
29+
dropdb: dropdb.o common.odumputils.o kwlookup.o keywords.o
3230
droplang: droplang.o common.o print.o mbprint.o
33-
dropuser: dropuser.o common.o$(DUMPUTILSOBJS)
34-
clusterdb: clusterdb.o common.o$(DUMPUTILSOBJS)
31+
dropuser: dropuser.o common.odumputils.o kwlookup.o keywords.o
32+
clusterdb: clusterdb.o common.odumputils.o kwlookup.o keywords.o
3533
vacuumdb: vacuumdb.o common.o
36-
reindexdb: reindexdb.o common.o$(DUMPUTILSOBJS)
34+
reindexdb: reindexdb.o common.odumputils.o kwlookup.o keywords.o
3735

3836
dumputils.c keywords.c: % : $(top_srcdir)/src/bin/pg_dump/%
3937
rm -f $@ && $(LN_S) $< .
@@ -64,5 +62,5 @@ uninstall:
6462

6563
clean distclean maintainer-clean:
6664
rm -f $(addsuffix $(X), $(PROGRAMS)) $(addsuffix .o, $(PROGRAMS))
67-
rm -f common.o$(DUMPUTILSOBJS) print.o mbprint.o $(WIN32RES)
65+
rm -f common.odumputils.o kwlookup.o keywords.o print.o mbprint.o $(WIN32RES)
6866
rm -f dumputils.c print.c mbprint.c kwlookup.c keywords.c

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp