summaryrefslogtreecommitdiff
path: root/src/bin/Makefile
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2000-06-27 00:32:06 +0000
committerPeter Eisentraut <peter_e@gmx.net>2000-06-27 00:32:06 +0000
commit5bb8b62983799c8bb5ef2e578629dbd2705bbd52 (patch)
tree75199eec2bcf58ab455f7adab52285580d97e4be /src/bin/Makefile
parentecef326850ab087d78f217f8d97008d3974cbd76 (diff)
downloadpostgresql-5bb8b62983799c8bb5ef2e578629dbd2705bbd52.tar.gz
Makefile cleanup for bin and pl subtrees. They should now support
all the standard semantics. Also get rid of Makefile.in's on the way and instead declare all variables in Makefile.global.
Diffstat (limited to 'src/bin/Makefile')
-rw-r--r--src/bin/Makefile29
1 files changed, 16 insertions, 13 deletions
diff --git a/src/bin/Makefile b/src/bin/Makefile
index 9aaec45091..6e2ac06944 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -1,30 +1,27 @@
#-------------------------------------------------------------------------
#
-# Makefile
-# Makefile for src/bin (client programs)
+# Makefile for src/bin (client programs)
#
# Copyright (c) 1994, Regents of the University of California
#
-#
-# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.25 2000/01/20 21:51:02 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.26 2000/06/27 00:30:49 petere Exp $
#
#-------------------------------------------------------------------------
-SRCDIR= ..
+subdir = src/bin
+top_builddir = ../..
include ../Makefile.global
-DIRS = pg_id pg_version psql pg_dump pg_passwd \
- scripts initdb initlocation ipcclean \
- pg_ctl
+DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \
+ pg_passwd pg_version psql scripts
+
+ALLDIRS := $(DIRS) pg_encoding pgaccess pgtclsh
ifdef MULTIBYTE
DIRS += pg_encoding
endif
-#
# TCL/TK programs
-#
ifeq ($(USE_TCL), true)
ifeq ($(USE_TK), true)
DIRS += pgaccess
@@ -32,5 +29,11 @@ endif
DIRS += pgtclsh
endif
-.DEFAULT all:
- for i in $(DIRS); do $(MAKE) -C $$i $@; done
+all install installdirs uninstall depend:
+ @for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit 1; done
+
+clean:
+ @for dir in $(DIRS); do $(MAKE) -C $$dir $@; done
+
+distclean maintainer-clean:
+ @for dir in $(ALLDIRS); do $(MAKE) -C $$dir $@; done