[Audit-test-developer] [PATCH 3/3] remove /Makefile dependency on rules.mk

[Jiri J. <jja...@re...>]

The idea is to have a small independent Makefile in the "root",
serving as a starting point for recursion into audit-test and ltp.

The systeminfo target is now usable only by the toplevel Makefile.

Signed-off-by: Jiri Jaburek <jja...@re...>
---
 Makefile            | 62 +++++++++++++++++++++++++++++++++++++++++------------
 audit-test/rules.mk | 19 +---------------
 2 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/Makefile b/Makefile
index 194a6e7..3f997d7 100644
--- a/Makefile
+++ b/Makefile
@@ -32,29 +32,63 @@
 
 TOPDIR		= .
 
-include $(TOPDIR)/audit-test/rules.mk
+SUB_DIRS	= audit-test ltp
 
-SUB_DIRS        = audit-test ltp
+REPORT		= logs-*.tar.gz
+SYSTEMINFO	= systeminfo.run.log
+SUMMARY		= run.log
 
-LOG		= run.log
 
-run:
-	for DIR in $(SUB_DIRS); do \
-		make -C $$DIR run; \
+# generic recursion into all SUB_DIRS
+.PHONY: subdirs
+subdirs:
+	@for x in $(SUB_DIRS); do \
+		$(MAKE) -C $$x $(MAKECMDGOALS) || exit $$?; \
 	done
-	make report
+
+
+.PHONY: all
+all: subdirs
+
+.PHONY: run
+run: subdirs
+	$(MAKE) report
+
+.PHONY: clean
+clean: subdirs
+
+.PHONY: distclean
+distclean: subdirs
+	rm -f $(REPORT) $(SYSTEMINFO) $(SUMMARY)
+
 
 .PHONY: report
-ALL_LOGS	+= logs-*.tar.gz
 report: systeminfo summary
 	@tarball="logs-$$(date +'%m%d%Y_%H%M').tar.gz"; \
 	tar zcvf logs-$$(date +"%m%d%Y_%H%M").tar.gz $$(find . -name "*.log"); \
 	ls -l $$tarball
 
+.PHONY: systeminfo
+systeminfo:
+	echo "==> date <==" > $(SYSTEMINFO)
+	date >> $(SYSTEMINFO)
+	echo "" >> $(SYSTEMINFO)
+	echo "==> uname -a <==" >> $(SYSTEMINFO)
+	uname -a >> $(SYSTEMINFO)
+	echo "" >> $(SYSTEMINFO)
+	echo "==> uptime <==" >> $(SYSTEMINFO)
+	uptime >> $(SYSTEMINFO)
+	echo "" >> $(SYSTEMINFO)
+	echo "==> cat /proc/cpuinfo <==" >> $(SYSTEMINFO)
+	cat /proc/cpuinfo >> $(SYSTEMINFO)
+	echo "" >> $(SYSTEMINFO)
+	echo "==> rpm -qai <==" >> $(SYSTEMINFO)
+	rpm -qai >> $(SYSTEMINFO)
+
 .PHONY: summary
 summary:
-	@echo "Test Report Summary ($$(date))" > $(LOG)
-	@echo "" >> $(LOG)
+	@echo "Test Report Summary ($$(date))" > $(SUMMARY)
+	@echo "" >> $(SUMMARY)
 	@for dir_iter in $(SUB_DIRS); do \
 		if ls $$dir_iter/*rollup.log > /dev/null 2>&1; then \
 			log_iter=$$(ls $$dir_iter/*rollup.log); \
@@ -64,10 +98,10 @@ summary:
 			continue; \
 		fi; \
 		echo " looking at report: $$log_iter"; \
-		echo "####### Log File: $$log_iter" >> $(LOG); \
-		cat $$log_iter >> $(LOG); \
-		echo "####### Log End" >> $(LOG); \
-		echo "" >> $(LOG); \
+		echo "####### Log File: $$log_iter" >> $(SUMMARY); \
+		cat $$log_iter >> $(SUMMARY); \
+		echo "####### Log End" >> $(SUMMARY); \
+		echo "" >> $(SUMMARY); \
 	done
 
 .PHONY: dist
diff --git a/audit-test/rules.mk b/audit-test/rules.mk
index 294ed4e..330b440 100644
--- a/audit-test/rules.mk
+++ b/audit-test/rules.mk
@@ -40,7 +40,6 @@ Z		= s390
 Z64		= s390x
 X86_64		= x86_64
 IA		= ia64
-SYSTEMINFO      = systeminfo.run.log
 CFLAGS          += -g -O2 -Wall -Werror -D_GNU_SOURCE -fno-strict-aliasing
 LDFLAGS         +=
 
@@ -191,7 +190,7 @@ _clean:
 
 clean: _clean
 
-ALL_LOGS += run.log rollup.log $(SYSTEMINFO)
+ALL_LOGS += run.log rollup.log
 _distclean: clean
 	@if [[ "$(MAKECMDGOALS)" == distclean ]]; then \
 	    for x in $(SUB_DIRS); do \
@@ -304,22 +303,6 @@ subdirs_quiet:
 # Command framework execution rules
 ##########################################################################
 
-systeminfo::
-	echo "==> date <==" > $(SYSTEMINFO)
-	date >> $(SYSTEMINFO)
-	echo "" >> $(SYSTEMINFO)
-	echo "==> uname -a <==" >> $(SYSTEMINFO)
-	uname -a >> $(SYSTEMINFO)
-	echo "" >> $(SYSTEMINFO)
-	echo "==> uptime <==" >> $(SYSTEMINFO)
-	uptime >> $(SYSTEMINFO)
-	echo "" >> $(SYSTEMINFO)
-	echo "==> cat /proc/cpuinfo <==" >> $(SYSTEMINFO)
-	cat /proc/cpuinfo >> $(SYSTEMINFO)
-	echo "" >> $(SYSTEMINFO)
-	echo "==> rpm -qai <==" >> $(SYSTEMINFO)
-	rpm -qai >> $(SYSTEMINFO)
-
 ifneq ($(DEBUG),)
 DEBUG_ARG	= -d $(DEBUG)
 endif
-- 
1.7.11.7