i

scrappy · scrappy · commit fa11e5e994a0 · 1996-08-20T04:16:20.000Z
Improvements to Makefiles to compensate for errors in compiling

From: bryanh@giraffe.netgate.net (Bryan Henderson)
diff --git a/src/bin/Makefile b/src/bin/Makefile
@@ -7,29 +7,33 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.3 1996/07/25 06:54:26 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.3.2.1 1996/08/20 04:16:20 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 MKDIR=../mk
 -include $(MKDIR)/../Makefile.global
 
+.DEFAULT all:
 #
 # C programs
 #
-SUBDIR=  pg_id pg_version psql pg_dump
-
+	$(MAKE) -C pg_id $@
+	$(MAKE) -C pg_version $@
+	$(MAKE) -C psql $@
+	$(MAKE) -C pg_dump $@
 #
 # Shell scripts
 # 
-SUBDIR+= cleardbdir createdb createuser destroydb destroyuser initdb 
-
+	$(MAKE) -C cleardbdir $@
+	$(MAKE) -C createdb $@
+	$(MAKE) -C createuser $@
+	$(MAKE) -C destroydb $@
+	$(MAKE) -C destroyuser $@
+	$(MAKE) -C initdb $@
 #
 # TCL/TK programs
 #
 ifeq ($(USE_TCL), true)
-SUBDIR += pgtclsh
+	$(MAKE) -C pgtclsh $@
 endif
-
-include $(MKDIR)/postgres.subdir.mk
-

Original file line number	Diff line number	Diff line change
`@@ -7,29 +7,33 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.3 1996/07/25 06:54:26 scrappy Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.3.2.1 1996/08/20 04:16:20 scrappy Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`14`	`14`	`MKDIR=../mk`
`15`	`15`	`-include $(MKDIR)/../Makefile.global`
`16`	`16`
	`17`	`+.DEFAULT all:`
`17`	`18`	`#`
`18`	`19`	`# C programs`
`19`	`20`	`#`
`20`		`-SUBDIR= pg_id pg_version psql pg_dump`
`21`		`-`
	`21`	`+ $(MAKE) -C pg_id $@`
	`22`	`+ $(MAKE) -C pg_version $@`
	`23`	`+ $(MAKE) -C psql $@`
	`24`	`+ $(MAKE) -C pg_dump $@`
`22`	`25`	`#`
`23`	`26`	`# Shell scripts`
`24`	`27`	`#`
`25`		`-SUBDIR+= cleardbdir createdb createuser destroydb destroyuser initdb`
`26`		`-`
	`28`	`+ $(MAKE) -C cleardbdir $@`
	`29`	`+ $(MAKE) -C createdb $@`
	`30`	`+ $(MAKE) -C createuser $@`
	`31`	`+ $(MAKE) -C destroydb $@`
	`32`	`+ $(MAKE) -C destroyuser $@`
	`33`	`+ $(MAKE) -C initdb $@`
`27`	`34`	`#`
`28`	`35`	`# TCL/TK programs`
`29`	`36`	`#`
`30`	`37`	`ifeq ($(USE_TCL), true)`
`31`		`-SUBDIR += pgtclsh`
	`38`	`+ $(MAKE) -C pgtclsh $@`
`32`	`39`	`endif`
`33`		`-`
`34`		`-include $(MKDIR)/postgres.subdir.mk`
`35`		`-`