8000 Revert restructuring of bin/scripts/Makefile · MSPawanRanjith/postgres@3652766 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3652766

Browse files
mhagandermhagander
committed
Revert restructuring of bin/scripts/Makefile
The Makefile portion of 91f3ffc broke the MSVC build. This patch reverts the changes to the Makefile and adjusts it to work with the new code, while keeping the actual code changes from the original patch. Author: Victor Wagner <vitus@wagner.pp.ru>
1 parent e35f4f4 commit 3652766

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.o mbprint.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.o mbprint.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.o common.o dumputils.o kwlookup.o keywords.o print.o mbprint.o | submake-libpq submake-libpgport
30+
createuser: createuser.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
31+
dropdb: dropdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
32+
droplang: droplang.o common.o dumputils.o kwlookup.o keywords.o print.o mbprint.o | submake-libpq submake-libpgport
33+
dropuser: dropuser.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
34+
clusterdb: clusterdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
35+
vacuumdb: vacuumdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
36+
reindexdb: reindexdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
37+
pg_isready: pg_isready.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
38+
3939

4040
dumputils.c keywords.c: % : $(top_srcdir)/src/bin/pg_dump/%
4141
rm -f $@ && $(LN_S) $< .
@@ -67,5 +67,5 @@ uninstall:
6767

6868
clean distclean maintainer-clean:
6969
rm -f $(addsuffix $(X), $(PROGRAMS)) $(addsuffix .o, $(PROGRAMS))
70-
rm -f $(SCRIPTS_COMMON) print.o mbprint.o $(WIN32RES)
70+
rm -f common.o dumputils.o kwlookup.o keywords.o print.o mbprint.o $(WIN32RES)
7171
rm -f dumputils.c print.c mbprint.c kwlookup.c keywords.c

0 commit comments

Comments
 (0)
0