From 5181bebba73b2fdcb38f4c7f06491e8092873969 Mon Sep 17 00:00:00 2001 From: Magnus Hagander <magnus@hagander.net> Date: Tue, 27 Feb 2018 14:08:53 +0100 Subject: [PATCH] Revert restructuring of bin/scripts/Makefile 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> --- src/bin/scripts/Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) mode change 100644 => 100755 src/bin/scripts/Makefile diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile old mode 100644 new mode 100755 index a893920f9cc..2bccff5b9dc --- 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 -- GitLab