From 4206b103a3f02198c7e46db93746a0f218f35f0f Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Sat, 21 Jul 2007 21:28:46 +0000
Subject: EncapPackages: Give encap package name in a non-hackish way, other
 misc Makefile updates.

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3533 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/src/Makefile | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'encap/src/Makefile')

diff --git a/encap/src/Makefile b/encap/src/Makefile
index d97de337d..0e3056ed6 100644
--- a/encap/src/Makefile
+++ b/encap/src/Makefile
@@ -10,8 +10,9 @@ MKINSTALLDIRS = ./bcfg2-site/bcfg2-site-RENAME/mkinstalldirs
 log :
 	@printf "Building in background, and logging to ./make.log\n"
 	( $(MAKE) all > ./make.log 2>&1 ) &
+	tail -f make.log
 
-all : distclean
+all : clean
 	$(MAKE) -C ./encap-profiles all
 	$(MAKE) -C ./bcfg2-site all
 	$(MAKE) -C ./makeself-dist all
@@ -24,13 +25,17 @@ all : distclean
 	@printf "\n"
     
 clean :
+	-$(MAKE) -C ./encap-profiles clean
+	-$(MAKE) -C ./bcfg2-site clean
+	-$(MAKE) -C ./makeself-dist clean
 	-rm ./*.log ./*~ ./\#*
-	
-distclean : clean
 	-rm -rf $(DEST) makeself-dist/bcfg2-*
-	-rm -rf bcfg2-site/bcfg2-site-*.tar.gz
-	
+	-cd bcfg2-site && ls | grep bcfg2-site | grep -v bcfg2-site-RENAME | xargs -n1 rm -rf
+
+distclean : clean
+	-$(MAKE) -C ./encap-profiles distclean
+	-$(MAKE) -C ./bcfg2-site distclean
+	-$(MAKE) -C ./makeself-dist distclean
+
 uninstall : distclean
-	$(MAKE) -C ./encap-profiles uninstall
-	$(MAKE) -C ./bcfg2-site distclean
-	$(MAKE) -C ./makeself-dist distclean
+	-$(MAKE) -C ./encap-profiles uninstall
-- 
cgit v1.2.3-1-g7c22