diff options
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/Makefile | 3 | ||||
| -rw-r--r-- | src/bin/initdb/Makefile | 4 | ||||
| -rw-r--r-- | src/bin/pg_config/Makefile | 4 | ||||
| -rw-r--r-- | src/bin/pg_controldata/Makefile | 4 | ||||
| -rw-r--r-- | src/bin/pg_ctl/Makefile | 4 | ||||
| -rw-r--r-- | src/bin/pg_dump/Makefile | 8 | ||||
| -rw-r--r-- | src/bin/pg_resetxlog/Makefile | 4 | ||||
| -rw-r--r-- | src/bin/psql/Makefile | 4 | ||||
| -rw-r--r-- | src/bin/scripts/Makefile | 20 |
9 files changed, 27 insertions, 28 deletions
diff --git a/src/bin/Makefile b/src/bin/Makefile index 63b32e4598b..c81b6654817 100644 --- a/src/bin/Makefile +++ b/src/bin/Makefile @@ -19,5 +19,4 @@ ifeq ($(PORTNAME), win32) SUBDIRS+=pgevent endif -all install installdirs uninstall distprep clean distclean maintainer-clean: - @for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done +$(recurse) diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile index 99c8b1bca40..903fbc10970 100644 --- a/src/bin/initdb/Makefile +++ b/src/bin/initdb/Makefile @@ -20,9 +20,9 @@ override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS) OBJS= initdb.o encnames.o pqsignal.o $(WIN32RES) -all: submake-libpgport initdb +all: initdb -initdb: $(OBJS) +initdb: $(OBJS) | submake-libpgport $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) # We used to pull in all of libpq to get encnames and pqsignal, but that diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile index 732144dde6c..c7e5a023744 100644 --- a/src/bin/pg_config/Makefile +++ b/src/bin/pg_config/Makefile @@ -31,9 +31,9 @@ override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\"" override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\"" override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\"" -all: submake-libpgport pg_config +all: pg_config -pg_config: $(OBJS) +pg_config: $(OBJS) | submake-libpgport $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile index bcdf741fdc5..180c5ebfe8d 100644 --- a/src/bin/pg_controldata/Makefile +++ b/src/bin/pg_controldata/Makefile @@ -17,9 +17,9 @@ include $(top_builddir)/src/Makefile.global OBJS= pg_controldata.o pg_crc.o $(WIN32RES) -all: submake-libpgport pg_controldata +all: pg_controldata -pg_controldata: $(OBJS) +pg_controldata: $(OBJS) | submake-libpgport $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile index 0d49509724e..992799c2155 100644 --- a/src/bin/pg_ctl/Makefile +++ b/src/bin/pg_ctl/Makefile @@ -20,9 +20,9 @@ override CPPFLAGS := -DDEF_PGPORT=$(DEF_PGPORT) -I$(libpq_srcdir) $(CPPFLAGS) OBJS= pg_ctl.o $(WIN32RES) -all: submake-libpq submake-libpgport pg_ctl +all: pg_ctl -pg_ctl: $(OBJS) $(libpq_builddir)/libpq.a +pg_ctl: $(OBJS) | submake-libpq submake-libpgport $(CC) $(CFLAGS) $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile index f4c716ee2fc..0367466f845 100644 --- a/src/bin/pg_dump/Makefile +++ b/src/bin/pg_dump/Makefile @@ -27,15 +27,15 @@ KEYWRDOBJS = keywords.o kwlookup.o kwlookup.c: % : $(top_srcdir)/src/backend/parser/% rm -f $@ && $(LN_S) $< . -all: submake-libpq submake-libpgport pg_dump pg_restore pg_dumpall +all: pg_dump pg_restore pg_dumpall -pg_dump: pg_dump.o common.o pg_dump_sort.o $(OBJS) $(KEYWRDOBJS) $(libpq_builddir)/libpq.a +pg_dump: pg_dump.o common.o pg_dump_sort.o $(OBJS) $(KEYWRDOBJS) | submake-libpq submake-libpgport $(CC) $(CFLAGS) pg_dump.o common.o pg_dump_sort.o $(KEYWRDOBJS) $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) -pg_restore: pg_restore.o $(OBJS) $(KEYWRDOBJS) $(libpq_builddir)/libpq.a +pg_restore: pg_restore.o $(OBJS) $(KEYWRDOBJS) | submake-libpq submake-libpgport $(CC) $(CFLAGS) pg_restore.o $(KEYWRDOBJS) $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) -pg_dumpall: pg_dumpall.o dumputils.o $(KEYWRDOBJS) $(libpq_builddir)/libpq.a +pg_dumpall: pg_dumpall.o dumputils.o $(KEYWRDOBJS) | submake-libpq submake-libpgport $(CC) $(CFLAGS) pg_dumpall.o dumputils.o $(KEYWRDOBJS) $(WIN32RES) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs diff --git a/src/bin/pg_resetxlog/Makefile b/src/bin/pg_resetxlog/Makefile index 67ba562949f..ad56a115033 100644 --- a/src/bin/pg_resetxlog/Makefile +++ b/src/bin/pg_resetxlog/Makefile @@ -17,9 +17,9 @@ include $(top_builddir)/src/Makefile.global OBJS= pg_resetxlog.o pg_crc.o $(WIN32RES) -all: submake-libpgport pg_resetxlog +all: pg_resetxlog -pg_resetxlog: $(OBJS) +pg_resetxlog: $(OBJS) | submake-libpgport $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile index 9e1c3cd6f77..a30c6684240 100644 --- a/src/bin/psql/Makefile +++ b/src/bin/psql/Makefile @@ -29,9 +29,9 @@ OBJS= command.o common.o help.o input.o stringutils.o mainloop.o copy.o \ FLEXFLAGS = -Cfe -all: submake-libpq submake-libpgport psql +all: psql -psql: $(OBJS) $(libpq_builddir)/libpq.a +psql: $(OBJS) | submake-libpq submake-libpgport $(CC) $(CFLAGS) $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) help.o: sql_help.h diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile index 4248f3bedd9..d0b0c1c20e0 100644 --- a/src/bin/scripts/Makefile +++ b/src/bin/scripts/Makefile @@ -20,20 +20,20 @@ PROGRAMS = createdb createlang createuser dropdb droplang dropuser clusterdb vac override CPPFLAGS := -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir) $(CPPFLAGS) -all: submake-libpq $(PROGRAMS) +all: $(PROGRAMS) %: %.o $(WIN32RES) $(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) -createdb: createdb.o common.o dumputils.o kwlookup.o keywords.o -createlang: createlang.o common.o print.o mbprint.o -createuser: createuser.o common.o dumputils.o kwlookup.o keywords.o -dropdb: dropdb.o common.o dumputils.o kwlookup.o keywords.o -droplang: droplang.o common.o print.o mbprint.o -dropuser: dropuser.o common.o dumputils.o kwlookup.o keywords.o -clusterdb: clusterdb.o common.o dumputils.o kwlookup.o keywords.o -vacuumdb: vacuumdb.o common.o -reindexdb: reindexdb.o common.o dumputils.o kwlookup.o keywords.o +createdb: createdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq +createlang: createlang.o common.o print.o mbprint.o | submake-libpq +createuser: createuser.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq +dropdb: dropdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq +droplang: droplang.o common.o print.o mbprint.o | submake-libpq +dropuser: dropuser.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq +clusterdb: clusterdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq +vacuumdb: vacuumdb.o common.o | submake-libpq +reindexdb: reindexdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq dumputils.c keywords.c: % : $(top_srcdir)/src/bin/pg_dump/% rm -f $@ && $(LN_S) $< . |