[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Ovirt-devel] [PATCH] Cleanup of output in ovirt.mk file as well as fixing autoconf problems



---
 ovirt.mk |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ovirt.mk b/ovirt.mk
index 8b97ef4..126502c 100644
--- a/ovirt.mk
+++ b/ovirt.mk
@@ -8,11 +8,16 @@ OVIRT_BRANCH ?= master
 
 SUBDIRS ?= release server node node-image appliance docs
 
+SUBDIR_SEP = ============================================================
+
 export OVIRT_CACHE_DIR ?= $(HOME)/ovirt-cache
 
 define for_each_subdir
 	+for dir in $(SUBDIRS); do \
 		if test -d $$dir ; then \
+			echo $(SUBDIR_SEP) $$dir ; \
+			(cd $$dir && test ! -f Makefile.in && test -f autogen.sh && ./autogen.sh ) || :; \
+			(cd $$dir && test ! -f Makefile && test -f configure && ./configure ) || :; \
 			$(MAKE) -C $$dir $@ || exit 1 ; \
 		fi ; \
 	done
@@ -29,24 +34,24 @@ $(SUBDIRS):
 	cd $@ && git pull -v && git checkout $(OVIRT_BRANCH)
 
 clean:
-	$(for_each_subdir)
+	@$(for_each_subdir)
 
 distclean:
-	$(for_each_subdir)
+	@$(for_each_subdir)
 
 bumpgit:
-	$(for_each_subdir)
+	@$(for_each_subdir)
 
 bumprelease:
-	$(for_each_subdir)
+	@$(for_each_subdir)
 
 bumpversion:
-	$(for_each_subdir)
+	@$(for_each_subdir)
 
 status diff:
-	for dir in $(SUBDIRS); do \
+	@for dir in $(SUBDIRS); do \
 	  if test -d $$dir ; then \
-	    echo ===== $$dir =============================================== ;\
+	    echo $(SUBDIR_SEP) $$dir ; \
 	    (cd $$dir && git $@) || :; \
 	  fi ; \
 	done
@@ -57,8 +62,9 @@ publish:
 		if ! test -d $$dir ; then \
 			$(MAKE) $$dir || exit 1 ; \
 		fi ; \
-		( cd $$dir; test ! -f Makefile.in && ./autogen.sh ); \
-		( cd $$dir; test ! -f Makefile && ./configure ); \
+		echo $(SUBDIR_SEP) $$dir ; \
+		(cd $$dir && test ! -f Makefile.in && test -f autogen.sh && ./autogen.sh ) || :; \
+		(cd $$dir && test ! -f Makefile && test -f configure && ./configure ) || :; \
 		$(MAKE) -C $$dir $@ || exit 1 ; \
 	done
 	rm -f rpms
-- 
1.5.5.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]