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

Commit41545d1

Browse files
committed
Revert restructuring of bin/scripts/Makefile
The Makefile portion of91f3ffc brokethe MSVC build. This patch reverts the changes to the Makefile andadjusts it to work with the new code, while keeping the actual codechanges from the original patch.Author: Victor Wagner <vitus@wagner.pp.ru>
1 parent1f19e46 commit41545d1

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

‎src/bin/scripts/Makefile‎

100644100755
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ all: $(PROGRAMS)
2525
%:%.o$(WIN32RES)
2626
$(CC)$(CFLAGS)$^$(libpq_pgport)$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)
2727

28-
SCRIPTS_COMMON = common.o dumputils.o kwlookup.o keywords.o
29-
createdb: createdb.o$(SCRIPTS_COMMON) | submake-libpq submake-libpgport
30-
createlang: createlang.o$(SCRIPTS_COMMON) print.ombprint.o | submake-libpq submake-libpgport
31-
createuser: createuser.o$(SCRIPTS_COMMON) | submake-libpq submake-libpgport
32-
dropdb: dropdb.o$(SCRIPTS_COMMON) | submake-libpq submake-libpgport
33-
droplang: droplang.o$(SCRIPTS_COMMON) print.ombprint.o | submake-libpq submake-libpgport
34-
dropuser: dropuser.o$(SCRIPTS_COMMON) | submake-libpq submake-libpgport
35-
clusterdb: clusterdb.o$(SCRIPTS_COMMON) | submake-libpq submake-libpgport
36-
vacuumdb: vacuumdb.o$(SCRIPTS_COMMON) | submake-libpq submake-libpgport
37-
reindexdb: reindexdb.o$(SCRIPTS_COMMON) | submake-libpq submake-libpgport
38-
pg_isready: pg_isready.o$(SCRIPTS_COMMON) | submake-libpq submake-libpgport
28+
createdb: createdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
29+
createlang: createlang.ocommon.o dumputils.o kwlookup.o keywords.o print.o mbprint.o | submake-libpq submake-libpgport
30+
createuser: createuser.ocommon.o dumputils.okwlookup.o keywords.o | submake-libpq submake-libpgport
31+
dropdb: dropdb.ocommon.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
32+
droplang: droplang.ocommon.o dumputils.o kwlookup.o keywords.o print.o mbprint.o | submake-libpq submake-libpgport
33+
dropuser: dropuser.ocommon.o dumputils.okwlookup.o keywords.o | submake-libpq submake-libpgport
34+
clusterdb: clusterdb.ocommon.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
35+
vacuumdb: vacuumdb.ocommon.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
36+
reindexdb: reindexdb.ocommon.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
37+
pg_isready: pg_isready.ocommon.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
38+
3939

4040
dumputils.ckeywords.c:% :$(top_srcdir)/src/bin/pg_dump/%
4141
rm -f$@&&$(LN_S)$<.
@@ -66,7 +66,7 @@ uninstall:
6666

6767
cleandistcleanmaintainer-clean:
6868
rm -f$(addsuffix$(X),$(PROGRAMS))$(addsuffix .o,$(PROGRAMS))
69-
rm -f$(SCRIPTS_COMMON) print.o mbprint.o$(WIN32RES)
69+
rm -fcommon.o dumputils.o kwlookup.o keywords.o print.o mbprint.o$(WIN32RES)
7070
rm -f dumputils.c print.c mbprint.c kwlookup.c keywords.c
7171
rm -rf tmp_check
7272

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp