From 8cd12669aeeca09e2fa5cc65701732fb8433bddc Mon Sep 17 00:00:00 2001
From: Leigh B Stoller <stoller@flux.utah.edu>
Date: Fri, 11 Jun 2010 12:55:56 -0600
Subject: [PATCH] Make sure apache and rc.d dirs get built. Add target to build
 elabinelab tarball using git archive.

---
 GNUmakefile.in | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5c915d643f..5c38d9a125 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -30,7 +30,7 @@ include Makeconf
 # Then things that depend on stuff we just did:
 #
 ifeq ($(STANDALONE_CLEARINGHOUSE),0)
-SUBDIRS = lib db assign www @optional_subdirs@ ipod security sensors \
+SUBDIRS = lib apache db assign www @optional_subdirs@ ipod security sensors \
 		pxe tbsetup account tmcd utils backend tip capture ipod vis \
 		sensors os xmlrpc install/newnode_sshkeys mote tools/whol \
 		tools/svn wiki bugdb collab protogeni node_usage install
@@ -41,7 +41,7 @@ else
 SUBDIRS = db tbsetup account protogeni
 endif
 
-all:		all-subdirs 
+all:		all-subdirs just-builddirs 
 
 #
 # We used to statically link our event agents.  We no longer do this, but
@@ -176,6 +176,10 @@ ifeq ($(STANDALONE_CLEARINGHOUSE),0)
 	-ln -s /usr/testbed/bin/nse $(INSTALL_TOPDIR)/bin
 endif
 
+just-builddirs:
+	@$(MAKE) -C rc.d all
+	@$(MAKE) -C apache all
+
 tipserv-install:
 	-mkdir -p $(INSTALL_TOPDIR)/log/tiplogs
 	-mkdir -p $(INSTALL_TOPDIR)/etc
@@ -425,6 +429,11 @@ elabinelab:
 	rm -f $(INSTALL_TOPDIR)/src/emulab-src.tar.gz
 	tar czf $(INSTALL_TOPDIR)/src/emulab-src.tar.gz -C $(SRCDIR) --exclude=.git .
 
+elabinelab-git:
+	-mkdir -p $(INSTALL_TOPDIR)/src
+	rm -f $(INSTALL_TOPDIR)/src/emulab-src.tar.gz
+	git archive --prefix=testbed/ | gzip -c > $(INSTALL_TOPDIR)/src/emulab-src.tar.gz
+
 # How to recursively descend into subdirectories to make general
 # targets such as `all'.
 %.MAKE:
-- 
GitLab