Improve Make process for parallel Make.

danbedard · Jun 21, 2014 · 250de7e · 250de7e
1 parent 6f231da
commit 250de7e
Show file tree

Hide file tree

Showing 30 changed files with 126 additions and 170 deletions.
diff --git a/.src.Makefile b/.src.Makefile
@@ -0,0 +1,20 @@
+include ../Makefile.config
+include ../Makefile.rules
+
+PHONY_TARGETS ?= src
+TARGETS ?= $(PHONY_TARGETS)
+
+$(TARGETS):
+	@$(MAKE) -C $@
+
+CLEAN_TARGETS = $(TARGETS:%=clean-%)
+$(CLEAN_TARGETS):
+	@$(MAKE) -C $(@:clean-%=%) clean
+clean: $(CLEAN_TARGETS)
+
+INSTALL_TARGETS = $(TARGETS:%=install-%)
+$(INSTALL_TARGETS): $(TARGETS)
+	@$(MAKE) -C $(@:install-%=%) install
+install: $(INSTALL_TARGETS)
+
+.PHONY: $(PHONY_TARGETS) all clean install test
diff --git a/Makefile b/Makefile
@@ -1,18 +1,38 @@
 include Makefile.config
 include Makefile.rules
 
-all clean: Makefile.config
-	for p in ${CCTOOLS_PACKAGES} ; do cd $$p && ${MAKE} $@ && cd .. ; done
+all: $(CCTOOLS_PACKAGES)
 
-test: Makefile.config
-	./run_all_tests.sh
+Makefile.config:
+	@echo "You must run 'configure' before '${MAKE}'."
+	@exit 1
+
+chirp work_queue sand allpairs wavefront makeflow ftp_lite parrot resource_monitor resource_monitor_visualizer makeflow_linker: dttools
+
+allpairs: sand work_queue
+makeflow: chirp work_queue
+parrot: chirp ftp_lite
+sand: work_queue
+wavefront: chirp work_queue
+work_queue: chirp
+
+$(CCTOOLS_PACKAGES): Makefile.config
+	@$(MAKE) -C $@
 
-install: all Makefile.config
-	for p in ${CCTOOLS_PACKAGES} ; do cd $$p && ${MAKE} $@ && cd .. ; done
+CLEAN_PACKAGES = $(CCTOOLS_PACKAGES:%=clean-%)
+$(CLEAN_PACKAGES):
+	@$(MAKE) -C $(@:clean-%=%) clean
+clean: $(CLEAN_PACKAGES)
+
+INSTALL_PACKAGES = $(CCTOOLS_PACKAGES:%=install-%)
+$(INSTALL_PACKAGES): $(CCTOOLS_PACKAGES)
+	@$(MAKE) -C $(@:install-%=%) install
+install: $(INSTALL_PACKAGES)
 	mkdir -p ${CCTOOLS_INSTALL_DIR}/etc
 	cp Makefile.config ${CCTOOLS_INSTALL_DIR}/etc/Makefile.config
 	cp COPYING ${CCTOOLS_INSTALL_DIR}/doc
 
-Makefile.config:
-	@echo "You must run 'configure' before '${MAKE}'."
-	@exit 1
+test: $(CCTOOLS_PACKAGES)
+	./run_all_tests.sh
+
+.PHONY: $(CCTOOLS_PACKAGES) $(INSTALL_PACKAGES) $(CLEAN_PACKAGES) all clean install test
diff --git a/allpairs/Makefile b/allpairs/Makefile
diff --git a/allpairs/Makefile b/allpairs/Makefile
@@ -0,0 +1 @@
+../.src.Makefile
diff --git a/apps/Makefile b/apps/Makefile
@@ -1,9 +1,3 @@
-include ../Makefile.config
-include ../Makefile.rules
+PHONY_TARGETS = wq_replica_exchange
 
-all test clean:
-	@for p in wq_replica_exchange; do cd $$p && $(MAKE) $@ && cd .. ; done
-
-install:
-
-.PHONY: all test install clean
+include ../.src.Makefile
diff --git a/chirp/Makefile b/chirp/Makefile
diff --git a/chirp/Makefile b/chirp/Makefile
@@ -0,0 +1 @@
+../.src.Makefile
diff --git a/deltadb/Makefile b/deltadb/Makefile
diff --git a/deltadb/Makefile b/deltadb/Makefile
@@ -0,0 +1 @@
+../.src.Makefile
diff --git a/deltadb/src/Makefile b/deltadb/src/Makefile
@@ -10,6 +10,7 @@ HEADERS = ${SOURCES:%.c=%.h}
 LIBRARIES = libdeltadb.a
 PROGRAMS = deltadb_collect deltadb_select_static deltadb_select_dynamic deltadb_select_complete deltadb_project deltadb_reduce_temporal deltadb_reduce_spatial deltadb_pivot
 PROGRAM_SOURCES = ${PROGRAMS:%=%.c}
+SCRIPTS= deltadb_collect deltadb_select_static deltadb_select_dynamic deltadb_select_complete deltadb_project deltadb_reduce_temporal deltadb_reduce_spatial deltadb_pivot
 
 all: ${LIBRARIES} $(PROGRAMS)
 
@@ -48,6 +49,11 @@ test: all
 clean:
 	rm -f core *~ *.o *.os *.so $(LIBRARIES) $(PROGRAMS)
 
+uninstall:
+	for s in ${SCRIPTS}; do rm -f ${CCTOOLS_INSTALL_DIR}/bin/$$s; done
+
 install: all
 	mkdir -p ${CCTOOLS_INSTALL_DIR}/bin
+	for s in ${SCRIPTS}; do cat $$s | sed "s:CCTOOLS_VERSION:${CCTOOLS_VERSION}:g" | sed "s:CCTOOLS_RELEASEDATE:${CCTOOLS_RELEASEDATE}:g" > ${CCTOOLS_INSTALL_DIR}/bin/$$s; chmod 755 ${CCTOOLS_INSTALL_DIR}/bin/$$s; done
 
+.PHONY: all clean install test uninstall
diff --git a/doc/Makefile b/doc/Makefile
@@ -46,3 +46,5 @@ test:
 
 clean:
 	rm -rf api $(HTMLFILES) $(MANFILES) $(ZIPFILES) *~
+
+.PHONY: all clean install test
diff --git a/dttools/Makefile b/dttools/Makefile
diff --git a/dttools/Makefile b/dttools/Makefile
@@ -0,0 +1 @@
+../.src.Makefile
diff --git a/ftp_lite/Makefile b/ftp_lite/Makefile
diff --git a/ftp_lite/Makefile b/ftp_lite/Makefile
@@ -0,0 +1 @@
+../.src.Makefile
diff --git a/ftsh/Makefile b/ftsh/Makefile
diff --git a/ftsh/Makefile b/ftsh/Makefile
@@ -0,0 +1 @@
+../.src.Makefile
diff --git a/makeflow/Makefile b/makeflow/Makefile
diff --git a/makeflow/Makefile b/makeflow/Makefile
@@ -0,0 +1 @@
+../.src.Makefile
diff --git a/makeflow_linker/Makefile b/makeflow_linker/Makefile
diff --git a/makeflow_linker/Makefile b/makeflow_linker/Makefile
@@ -0,0 +1 @@
+../.src.Makefile
diff --git a/parrot/Makefile b/parrot/Makefile
diff --git a/parrot/Makefile b/parrot/Makefile
@@ -0,0 +1 @@
+../.src.Makefile
diff --git a/resource_monitor/Makefile b/resource_monitor/Makefile
diff --git a/resource_monitor/Makefile b/resource_monitor/Makefile
@@ -0,0 +1 @@
+../.src.Makefile
diff --git a/resource_monitor_visualizer/Makefile b/resource_monitor_visualizer/Makefile
diff --git a/resource_monitor_visualizer/Makefile b/resource_monitor_visualizer/Makefile
@@ -0,0 +1 @@
+../.src.Makefile
diff --git a/resource_monitor_visualizer/src/Makefile b/resource_monitor_visualizer/src/Makefile
@@ -0,0 +1,21 @@
+include ../../Makefile.config
+include ../../Makefile.rules
+
+SCRIPT = resource_monitor_visualizer.py
+STATIC_RESOURCES = resource_monitor_visualizer_static
+
+all: $(SCRIPT)
+
+clean:
+
+install: all
+	mkdir -p ${CCTOOLS_INSTALL_DIR}/bin
+	mkdir -p ${CCTOOLS_INSTALL_DIR}/lib
+	cp ${SCRIPT} ${CCTOOLS_INSTALL_DIR}/bin/
+	cp -r ${STATIC_RESOURCES} ${CCTOOLS_INSTALL_DIR}/lib/
+
+uninstall:
+	rm -rf ${CCTOOLS_INSTALL_DIR}/lib/$(STATIC_RESOURCES)
+	rm -f ${CCTOOLS_INSTALL_DIR}/${SCRIPT}
+
+.PHONY: all clean install test
diff --git a/...alizer/bin/resource_monitor_visualizer.py → ...alizer/src/resource_monitor_visualizer.py b/...alizer/bin/resource_monitor_visualizer.py → ...alizer/src/resource_monitor_visualizer.py
diff --git a/...e_monitor_visualizer_static/css/style.css → ...e_monitor_visualizer_static/css/style.css b/...e_monitor_visualizer_static/css/style.css → ...e_monitor_visualizer_static/css/style.css
diff --git a/...itor_visualizer_static/img/arrow-next.png → ...itor_visualizer_static/img/arrow-next.png b/...itor_visualizer_static/img/arrow-next.png → ...itor_visualizer_static/img/arrow-next.png
diff --git a/...itor_visualizer_static/img/arrow-prev.png → ...itor_visualizer_static/img/arrow-prev.png b/...itor_visualizer_static/img/arrow-prev.png → ...itor_visualizer_static/img/arrow-prev.png
diff --git a/...monitor_visualizer_static/img/loading.gif → ...monitor_visualizer_static/img/loading.gif b/...monitor_visualizer_static/img/loading.gif → ...monitor_visualizer_static/img/loading.gif
diff --git a/...itor_visualizer_static/img/pagination.png → ...itor_visualizer_static/img/pagination.png b/...itor_visualizer_static/img/pagination.png → ...itor_visualizer_static/img/pagination.png
diff --git a/...r_visualizer_static/img/subtle_grunge.png → ...r_visualizer_static/img/subtle_grunge.png b/...r_visualizer_static/img/subtle_grunge.png → ...r_visualizer_static/img/subtle_grunge.png
diff --git a/...visualizer_static/js/slides.min.jquery.js → ...visualizer_static/js/slides.min.jquery.js b/...visualizer_static/js/slides.min.jquery.js → ...visualizer_static/js/slides.min.jquery.js
diff --git a/s3tools/Makefile b/s3tools/Makefile
diff --git a/s3tools/Makefile b/s3tools/Makefile
@@ -0,0 +1 @@
+../.src.Makefile
diff --git a/sand/Makefile b/sand/Makefile
diff --git a/sand/Makefile b/sand/Makefile
@@ -0,0 +1 @@
+../.src.Makefile
diff --git a/wavefront/Makefile b/wavefront/Makefile
diff --git a/wavefront/Makefile b/wavefront/Makefile
@@ -0,0 +1 @@
+../.src.Makefile
diff --git a/work_queue/Makefile b/work_queue/Makefile
diff --git a/work_queue/Makefile b/work_queue/Makefile
@@ -0,0 +1 @@
+../.src.Makefile
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,3 +46,5 @@ test:

		clean:
		rm -rf api $(HTMLFILES) $(MANFILES) $(ZIPFILES) *~

		.PHONY: all clean install test