diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2002-07-27 20:10:05 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2002-07-27 20:10:05 +0000 |
| commit | b0c3c48eb3779d9637a03c455f3934d9d7c08030 (patch) | |
| tree | 4fbf5c8d94ae2534735e1b7935edb40d6205cc44 /src/bin/pg_dump/Makefile | |
| parent | c3fdf8925ed7fbb3017be052e0700c51ceb12e0b (diff) | |
| download | postgresql-b0c3c48eb3779d9637a03c455f3934d9d7c08030.tar.gz | |
Assemble portability modules into libpgport library.
Some makefile simplifications.
Diffstat (limited to 'src/bin/pg_dump/Makefile')
| -rw-r--r-- | src/bin/pg_dump/Makefile | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile index 1a19c71fc2..eff7998186 100644 --- a/src/bin/pg_dump/Makefile +++ b/src/bin/pg_dump/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.35 2002/07/15 21:34:05 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.36 2002/07/27 20:10:05 petere Exp $ # #------------------------------------------------------------------------- @@ -14,12 +14,11 @@ top_builddir = ../../.. 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 sprompt.o \ - $(STRDUP) $(STRTOUL) + pg_backup_files.o pg_backup_null.o pg_backup_tar.o sprompt.o override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -all: submake pg_dump pg_restore pg_dumpall +all: submake-libpq submake-libpgport pg_dump pg_restore pg_dumpall pg_dump: pg_dump.o common.o $(OBJS) $(libpq_builddir)/libpq.a $(CC) $(CFLAGS) pg_dump.o common.o $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@ @@ -34,10 +33,6 @@ pg_dumpall: pg_dumpall.sh $< >$@ chmod a+x $@ -.PHONY: submake -submake: - $(MAKE) -C $(libpq_builddir) all - install: all installdirs $(INSTALL_PROGRAM) pg_dump$(X) $(DESTDIR)$(bindir)/pg_dump$(X) $(INSTALL_PROGRAM) pg_restore$(X) $(DESTDIR)$(bindir)/pg_restore$(X) @@ -49,12 +44,5 @@ installdirs: uninstall: rm -f $(addprefix $(DESTDIR)$(bindir)/, pg_dump$(X) pg_restore$(X) pg_dumpall) -depend dep: - $(CC) -MM $(CFLAGS) *.c >depend - clean distclean maintainer-clean: rm -f pg_dump$(X) pg_restore$(X) $(OBJS) pg_dump.o common.o pg_restore.o pg_dumpall - -ifeq (depend,$(wildcard depend)) -include depend -endif |