diff options
| -rw-r--r-- | src/Makefile.global.in | 2 | ||||
| -rw-r--r-- | src/bin/scripts/Makefile | 19 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 758ea4357a7..41c131412e0 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -747,7 +747,7 @@ endif # since we put -l switches into LDFLAGS and those are order-sensitive. # In addition, include CFLAGS and LDFLAGS_EX per project conventions. %: %.o - $(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) + $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) ifndef PGXS diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile index 8c9fc0c298a..9f352b5e2b2 100644 --- a/src/bin/scripts/Makefile +++ b/src/bin/scripts/Makefile @@ -23,17 +23,14 @@ LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) all: $(PROGRAMS) -%: %.o $(WIN32RES) - $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) - -createdb: createdb.o common.o | submake-libpq submake-libpgport submake-libpgfeutils -createuser: createuser.o common.o | submake-libpq submake-libpgport submake-libpgfeutils -dropdb: dropdb.o common.o | submake-libpq submake-libpgport submake-libpgfeutils -dropuser: dropuser.o common.o | submake-libpq submake-libpgport submake-libpgfeutils -clusterdb: clusterdb.o common.o | submake-libpq submake-libpgport submake-libpgfeutils -vacuumdb: vacuumdb.o common.o | submake-libpq submake-libpgport submake-libpgfeutils -reindexdb: reindexdb.o common.o | submake-libpq submake-libpgport submake-libpgfeutils -pg_isready: pg_isready.o common.o | submake-libpq submake-libpgport submake-libpgfeutils +createdb: createdb.o common.o $(WIN32RES) | submake-libpq submake-libpgport submake-libpgfeutils +createuser: createuser.o common.o $(WIN32RES) | submake-libpq submake-libpgport submake-libpgfeutils +dropdb: dropdb.o common.o $(WIN32RES) | submake-libpq submake-libpgport submake-libpgfeutils +dropuser: dropuser.o common.o $(WIN32RES) | submake-libpq submake-libpgport submake-libpgfeutils +clusterdb: clusterdb.o common.o $(WIN32RES) | submake-libpq submake-libpgport submake-libpgfeutils +vacuumdb: vacuumdb.o common.o $(WIN32RES) | submake-libpq submake-libpgport submake-libpgfeutils +reindexdb: reindexdb.o common.o $(WIN32RES) | submake-libpq submake-libpgport submake-libpgfeutils +pg_isready: pg_isready.o common.o $(WIN32RES) | submake-libpq submake-libpgport submake-libpgfeutils install: all installdirs $(INSTALL_PROGRAM) createdb$(X) '$(DESTDIR)$(bindir)'/createdb$(X) |