diff options
| author | Magnus Hagander | 2018-02-27 13:08:53 +0000 |
|---|---|---|
| committer | Magnus Hagander | 2018-02-27 13:11:09 +0000 |
| commit | 5181bebba73b2fdcb38f4c7f06491e8092873969 (patch) | |
| tree | 74e6be9f831c2a607a3cf73bd6911118690f9d49 | |
| parent | f46bc90dbcf48766abcddc0221edc66dbffb4785 (diff) | |
Revert restructuring of bin/scripts/MakefileREL9_4_17
The Makefile portion of 91f3ffc5249eff99c311fb27e7b29a44d9c62be1 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 <[email protected]>
| -rwxr-xr-x[-rw-r--r--] | src/bin/scripts/Makefile | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile index a893920f9cc..2bccff5b9dc 100644..100755 --- a/src/bin/scripts/Makefile +++ b/src/bin/scripts/Makefile @@ -25,17 +25,17 @@ all: $(PROGRAMS) %: %.o $(WIN32RES) $(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) -SCRIPTS_COMMON = common.o dumputils.o kwlookup.o keywords.o -createdb: createdb.o $(SCRIPTS_COMMON) | submake-libpq submake-libpgport -createlang: createlang.o $(SCRIPTS_COMMON) print.o mbprint.o | submake-libpq submake-libpgport -createuser: createuser.o $(SCRIPTS_COMMON) | submake-libpq submake-libpgport -dropdb: dropdb.o $(SCRIPTS_COMMON) | submake-libpq submake-libpgport -droplang: droplang.o $(SCRIPTS_COMMON) print.o mbprint.o | submake-libpq submake-libpgport -dropuser: dropuser.o $(SCRIPTS_COMMON) | submake-libpq submake-libpgport -clusterdb: clusterdb.o $(SCRIPTS_COMMON) | submake-libpq submake-libpgport -vacuumdb: vacuumdb.o $(SCRIPTS_COMMON) | submake-libpq submake-libpgport -reindexdb: reindexdb.o $(SCRIPTS_COMMON) | submake-libpq submake-libpgport -pg_isready: pg_isready.o $(SCRIPTS_COMMON) | submake-libpq submake-libpgport +createdb: createdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport +createlang: createlang.o common.o dumputils.o kwlookup.o keywords.o print.o mbprint.o | submake-libpq submake-libpgport +createuser: createuser.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport +dropdb: dropdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport +droplang: droplang.o common.o dumputils.o kwlookup.o keywords.o print.o mbprint.o | submake-libpq submake-libpgport +dropuser: dropuser.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport +clusterdb: clusterdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport +vacuumdb: vacuumdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport +reindexdb: reindexdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport +pg_isready: pg_isready.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport + dumputils.c keywords.c: % : $(top_srcdir)/src/bin/pg_dump/% rm -f $@ && $(LN_S) $< . @@ -66,7 +66,7 @@ uninstall: clean distclean maintainer-clean: rm -f $(addsuffix $(X), $(PROGRAMS)) $(addsuffix .o, $(PROGRAMS)) - rm -f $(SCRIPTS_COMMON) 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 -rf tmp_check |