- more changes to build outside of the tree

- removed some old fds-only targets

Makefile

@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.16 2008/03/06 23:41:52 mjk Exp $
+# $Id: Makefile,v 1.17 2008/10/15 20:13:04 mjk Exp $
 #
 # @Copyright@
 # 
@@ -55,6 +55,10 @@
 # @Copyright@
 #
 # $Log: Makefile,v $
+# Revision 1.17  2008/10/15 20:13:04  mjk
+# - more changes to build outside of the tree
+# - removed some old fds-only targets
+#
 # Revision 1.16  2008/03/06 23:41:52  mjk
 # copyright storm on
 #
@@ -108,7 +112,6 @@
 #
 #
 
-ROLLSROOT = ..
 -include $(ROLLSROOT)/etc/Rolls.mk
 include Rolls.mk
 

bootstrap.sh

@@ -2,7 +2,7 @@
 #
 # This file should remain OS independent
 #
-# $Id: bootstrap.sh,v 1.6 2008/03/06 23:41:53 mjk Exp $
+# $Id: bootstrap.sh,v 1.7 2008/10/15 20:13:04 mjk Exp $
 #
 # @Copyright@
 # 
@@ -58,6 +58,10 @@
 # @Copyright@
 #
 # $Log: bootstrap.sh,v $
+# Revision 1.7  2008/10/15 20:13:04  mjk
+# - more changes to build outside of the tree
+# - removed some old fds-only targets
+#
 # Revision 1.6  2008/03/06 23:41:53  mjk
 # copyright storm on
 #
@@ -92,7 +96,7 @@
 # bootstrap roll development
 #
 
-. ../etc/bootstrap-functions.sh
+. $ROLLSROOT/etc/bootstrap-functions.sh
 
 compile_and_install atlas
 compile_and_install openmpi

src/Makefile

@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.17 2008/05/21 17:46:55 anoop Exp $
+# $Id: Makefile,v 1.18 2008/10/15 20:13:04 mjk Exp $
 #
 # @Copyright@
 # 
@@ -54,6 +54,10 @@
 # @Copyright@
 #
 # $Log: Makefile,v $
+# Revision 1.18  2008/10/15 20:13:04  mjk
+# - more changes to build outside of the tree
+# - removed some old fds-only targets
+#
 # Revision 1.17  2008/05/21 17:46:55  anoop
 # Merginig code from mercurial.
 # This change makes the HPC roll more solaris friendly
@@ -129,7 +133,7 @@
 # *** empty log message ***
 #
 
--include $(shell ../../../../bin/os).mk
+-include $(shell $(ROCKSROOT)/bin/os).mk
 
 default:	rpm
 

src/RPMS/Makefile

@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.9 2008/03/06 23:41:53 mjk Exp $
+# $Id: Makefile,v 1.10 2008/10/15 20:13:04 mjk Exp $
 #
 # @Copyright@
 # 
@@ -54,6 +54,10 @@
 # @Copyright@
 #
 # $Log: Makefile,v $
+# Revision 1.10  2008/10/15 20:13:04  mjk
+# - more changes to build outside of the tree
+# - removed some old fds-only targets
+#
 # Revision 1.9  2008/03/06 23:41:53  mjk
 # copyright storm on
 #
@@ -86,7 +90,6 @@
 #
 
 REDHAT.ROOT	= $(PWD)/../../
-ROCKSROOT	= ../../../../..
 MAKE.iscontrib	= 1
 -include $(ROCKSROOT)/etc/Rules.mk
 include Rules.mk

src/insert-ethers/Makefile

@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2008/03/06 23:41:53 mjk Exp $
+# $Id: Makefile,v 1.3 2008/10/15 20:13:04 mjk Exp $
 #
 # @Copyright@
 # 
@@ -54,6 +54,10 @@
 # @Copyright@
 #
 # $Log: Makefile,v $
+# Revision 1.3  2008/10/15 20:13:04  mjk
+# - more changes to build outside of the tree
+# - removed some old fds-only targets
+#
 # Revision 1.2  2008/03/06 23:41:53  mjk
 # copyright storm on
 #
@@ -67,7 +71,6 @@ PKGROOT = /opt/rocks/var/plugins/insertethers
 PLUGINS = $(wildcard *.py)
 
 REDHAT.ROOT = $(PWD)/../../
-ROCKSROOT = ../../../../..
 -include $(ROCKSROOT)/etc/Rules.mk
 include Rules.mk
 

src/iozone/Makefile

@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.14 2008/05/21 17:46:55 anoop Exp $
+# $Id: Makefile,v 1.15 2008/10/15 20:13:04 mjk Exp $
 #
 # @Copyright@
 # 
@@ -55,6 +55,10 @@
 # @Copyright@
 #
 # $Log: Makefile,v $
+# Revision 1.15  2008/10/15 20:13:04  mjk
+# - more changes to build outside of the tree
+# - removed some old fds-only targets
+#
 # Revision 1.14  2008/05/21 17:46:55  anoop
 # Merginig code from mercurial.
 # This change makes the HPC roll more solaris friendly
@@ -79,7 +83,6 @@
 
 PKGROOT		= /opt/iozone
 REDHAT.ROOT     = $(CURDIR)/../../
-ROCKSROOT       = ../../../../..
 -include $(ROCKSROOT)/etc/Rules.mk
 include Rules.mk
 

src/iperf/Makefile

@@ -1,5 +1,5 @@
 # --------------------------------------------------- -*- Makefile -*- --
-# $Id: Makefile,v 1.11 2008/05/21 17:46:55 anoop Exp $
+# $Id: Makefile,v 1.12 2008/10/15 20:13:04 mjk Exp $
 #
 # @Copyright@
 # 
@@ -55,6 +55,10 @@
 # @Copyright@
 #
 # $Log: Makefile,v $
+# Revision 1.12  2008/10/15 20:13:04  mjk
+# - more changes to build outside of the tree
+# - removed some old fds-only targets
+#
 # Revision 1.11  2008/05/21 17:46:55  anoop
 # Merginig code from mercurial.
 # This change makes the HPC roll more solaris friendly
@@ -98,7 +102,6 @@
 #
 
 REDHAT.ROOT     = $(CURDIR)/../../
-ROCKSROOT       = ../../../../..
 
 -include $(ROCKSROOT)/etc/Rules.mk
 include Rules.mk

src/mpi-tests/Makefile

@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 2008/05/21 17:46:55 anoop Exp $
+# $Id: Makefile,v 1.3 2008/10/15 20:13:04 mjk Exp $
 #
 # @Copyright@
 # 
@@ -55,6 +55,10 @@
 # @Copyright@
 #
 # $Log: Makefile,v $
+# Revision 1.3  2008/10/15 20:13:04  mjk
+# - more changes to build outside of the tree
+# - removed some old fds-only targets
+#
 # Revision 1.2  2008/05/21 17:46:55  anoop
 # Merginig code from mercurial.
 # This change makes the HPC roll more solaris friendly
@@ -65,7 +69,6 @@
 #
 
 REDHAT.ROOT     = $(CURDIR)/../../
-ROCKSROOT       = ../../../../..
 -include $(ROCKSROOT)/etc/Rules.mk
 include Rules.mk
 

src/mpich/Makefile

@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.11 2008/03/06 23:41:53 mjk Exp $
+# $Id: Makefile,v 1.12 2008/10/15 20:13:04 mjk Exp $
 #
 # @Copyright@
 # 
@@ -55,6 +55,10 @@
 # @Copyright@
 #
 # $Log: Makefile,v $
+# Revision 1.12  2008/10/15 20:13:04  mjk
+# - more changes to build outside of the tree
+# - removed some old fds-only targets
+#
 # Revision 1.11  2008/03/06 23:41:53  mjk
 # copyright storm on
 #
@@ -93,7 +97,6 @@
 MAKE.rpmflag = -bs
 
 REDHAT.ROOT     = $(PWD)/../../
-ROCKSROOT       = ../../../../..
 
 -include $(ROCKSROOT)/etc/Rules.mk
 include Rules.mk

src/mpich2/Makefile

@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 2008/03/06 23:41:54 mjk Exp $
+# $Id: Makefile,v 1.3 2008/10/15 20:13:04 mjk Exp $
 #
 # @Copyright@
 # 
@@ -55,6 +55,10 @@
 # @Copyright@
 #
 # $Log: Makefile,v $
+# Revision 1.3  2008/10/15 20:13:04  mjk
+# - more changes to build outside of the tree
+# - removed some old fds-only targets
+#
 # Revision 1.2  2008/03/06 23:41:54  mjk
 # copyright storm on
 #
@@ -64,7 +68,6 @@
 #
 
 REDHAT.ROOT     = $(CURDIR)/../../
-ROCKSROOT       = ../../../../..
 -include $(ROCKSROOT)/etc/Rules.mk
 include Rules.mk
 

src/openmpi/Makefile

@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.7 2008/04/07 23:03:02 bruno Exp $
+# $Id: Makefile,v 1.8 2008/10/15 20:13:04 mjk Exp $
 #
 # @Copyright@
 # 
@@ -51,6 +51,10 @@
 #
 #
 # $Log: Makefile,v $
+# Revision 1.8  2008/10/15 20:13:04  mjk
+# - more changes to build outside of the tree
+# - removed some old fds-only targets
+#
 # Revision 1.7  2008/04/07 23:03:02  bruno
 # add openmpi back into HPC roll. the bio roll will use thie mpi environment
 # to for a couple of its apps.
@@ -59,7 +63,6 @@
 
 PKGROOT = /opt/openmpi
 REDHAT.ROOT = $(PWD)/../../
-ROCKSROOT = ../../../../..
 
 -include $(ROCKSROOT)/etc/Rules.mk
 include Rules.mk

src/pvm/Makefile

@@ -1,5 +1,5 @@
 # --------------------------------------------------- -*- Makefile -*- --
-# $Id: Makefile,v 1.5 2008/03/06 23:41:54 mjk Exp $
+# $Id: Makefile,v 1.6 2008/10/15 20:13:04 mjk Exp $
 #
 # @Copyright@
 # 
@@ -55,6 +55,10 @@
 # @Copyright@
 #
 # $Log: Makefile,v $
+# Revision 1.6  2008/10/15 20:13:04  mjk
+# - more changes to build outside of the tree
+# - removed some old fds-only targets
+#
 # Revision 1.5  2008/03/06 23:41:54  mjk
 # copyright storm on
 #
@@ -74,7 +78,6 @@ ROCKS-EXAMPLES = pvm3-examples.tar Readme.rocks
 PKGROOT	= /usr/share/pvm3
 
 REDHAT.ROOT = $(PWD)/../../
-ROCKSROOT = ../../../../..
 -include $(ROCKSROOT)/etc/Rules.mk
 include Rules.mk
 -include $(ROCKSROOT)/etc/python.mk

src/referenceguide/Makefile

@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.9 2008/03/06 23:41:54 mjk Exp $
+# $Id: Makefile,v 1.10 2008/10/15 20:13:04 mjk Exp $
 #
 # @Copyright@
 # 
@@ -55,6 +55,10 @@
 # @Copyright@
 #
 # $Log: Makefile,v $
+# Revision 1.10  2008/10/15 20:13:04  mjk
+# - more changes to build outside of the tree
+# - removed some old fds-only targets
+#
 # Revision 1.9  2008/03/06 23:41:54  mjk
 # copyright storm on
 #
@@ -92,14 +96,10 @@
 
 GUIDENAME = rocks-documentation/reference-guide/$(VERSION)
 PKGROOT = /var/www/html/$(GUIDENAME)
-ROOT =
-TESTUSER = $(USER)
 OUTPUT = /var/www/html/test/$(GUIDENAME)
-TESTOUTPUT = /home/$(TESTUSER)/public_html/$(GUIDENAME)
 
 REDHAT.ROOT = $(PWD)/../../
 DOCROOT = ../../../../../doc/etc
-ROCKSROOT = ../../../../..
 -include $(ROCKSROOT)/etc/Rules.mk
 include Rules.mk
 
@@ -115,30 +115,10 @@ html:	index.sgml
 index.sgml: index.sgml.in
 	$(SED) $(SEDSPEC) $^ > $@
 
-testinstall: pretar
-	mkdir -p $(TESTOUTPUT)
-	$(MAKE) ROOT=$(TESTOUTPUT) PKGROOT= install
-
-# A proof is for running as a user.
-proof: testinstall index.sgml
-	jw --backend html --dsl $(PWD)/rocks.dsl#html \
-		--output $(TESTOUTPUT) index.sgml
-
-# Use test target if you are root.
-test: testinstall index.sgml
-	jw --backend html --dsl $(PWD)/rocks.dsl#html \
-		--output $(OUTPUT) index.sgml
-	install -ma+r rocks.css $(OUTPUT)
-
 pdf: index.sgml
 	jw --backend pdf --dsl $(PWD)/rocks.dsl#print index.sgml || true
-ifdef ROOT
 	install -ma+r index.pdf \
 		$(ROOT)/$(PKGROOT)/rocks-referenceguide-$(VERSION).pdf
-else
-	mv index.pdf rocks-referenceguide-$(VERSION).pdf
-endif
-
 build:
 
 pretar::