diff options
| author | Magnus Hagander | 2018-02-27 13:08:53 +0000 |
|---|---|---|
| committer | Magnus Hagander | 2018-02-27 13:08:53 +0000 |
| commit | 41545d1524eb461b91698f53316b556c96aaf3a5 (patch) | |
| tree | f2fb7f055ba0df6f17efc83713c67b2030b44b7c | |
| parent | 1f19e46124eee8c6a5483412f3856215deeb9156 (diff) | |
Revert restructuring of bin/scripts/MakefileREL9_5_12
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 <vitus@wagner.pp.ru>
| -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 2961c182eb6..842f5701b3f 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 |