diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-08-31 16:12:35 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-08-31 16:12:35 +0000 |
| commit | 424f0edcb8d73446223f1812d3ca88150e1cc953 (patch) | |
| tree | 6b0f0a9d1d9aed67873e9ff8acd2b5a6da77ac58 /src/bin/pg_dump | |
| parent | d4266620e1c92d0b5d76d8c583f2fbfcf5bcd7fe (diff) | |
| download | postgresql-424f0edcb8d73446223f1812d3ca88150e1cc953.tar.gz | |
Fix relative path references so that make knowns which dependencies refer
to one another. Sort out builddir vs srcdir variable namings. Remove some
now obsoleted make variables.
Diffstat (limited to 'src/bin/pg_dump')
| -rw-r--r-- | src/bin/pg_dump/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile index 4d5d8a5f49..87d9ace079 100644 --- a/src/bin/pg_dump/Makefile +++ b/src/bin/pg_dump/Makefile @@ -4,27 +4,27 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.22 2000/08/01 15:51:44 pjw Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.23 2000/08/31 16:11:13 petere Exp $ # #------------------------------------------------------------------------- subdir = src/bin/pg_dump top_builddir = ../../.. -include ../../Makefile.global +include $(top_builddir)/src/Makefile.global OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o pg_backup_files.o \ pg_backup_null.o pg_backup_tar.o $(STRDUP) -CFLAGS+= -I$(LIBPQDIR) +CPPFLAGS+= -I$(libpq_srcdir) LIBS+= -lz all: submake pg_dump pg_restore pg_dumpall -pg_dump: pg_dump.o common.o $(OBJS) $(LIBPQDIR)/libpq.a - $(CC) $(CFLAGS) -o $@ pg_dump.o common.o $(OBJS) $(LIBPQ) $(LDFLAGS) +pg_dump: pg_dump.o common.o $(OBJS) $(libpq_builddir)/libpq.a + $(CC) $(CFLAGS) -o $@ pg_dump.o common.o $(OBJS) $(libpq) $(LDFLAGS) -pg_restore: pg_restore.o $(OBJS) $(LIBPQDIR)/libpq.a - $(CC) $(CFLAGS) -o $@ pg_restore.o $(OBJS) $(LIBPQ) $(LDFLAGS) +pg_restore: pg_restore.o $(OBJS) $(libpq_builddir)/libpq.a + $(CC) $(CFLAGS) -o $@ pg_restore.o $(OBJS) $(libpq) $(LDFLAGS) ../../utils/strdup.o: $(MAKE) -C ../../utils strdup.o @@ -37,7 +37,7 @@ pg_dumpall: pg_dumpall.sh .PHONY: submake submake: - $(MAKE) -C $(LIBPQDIR) all + $(MAKE) -C $(libpq_builddir) all install: all installdirs $(INSTALL_PROGRAM) pg_dump$(X) $(bindir)/pg_dump$(X) |