Commit 700b4b7e authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Add genhostsfile directory.

Clean up subdir stuff to use the standard -subdir rules.
parent b6c3a192
...@@ -14,24 +14,12 @@ SYSTEM := $(shell uname -s) ...@@ -14,24 +14,12 @@ SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
SUBDIRS = imagezip frisbee.redux growdisk syncd dijkstra SUBDIRS = imagezip frisbee.redux growdisk syncd dijkstra genhostsfile
all: $(SUBDIRS) split-image.sh all: all-subdirs split-image.sh
include $(TESTBED_SRCDIR)/GNUmakerules include $(TESTBED_SRCDIR)/GNUmakerules
imagezip:
@$(MAKE) -C imagezip all
frisbee.redux:
@$(MAKE) -C frisbee.redux all
syncd:
@$(MAKE) -C syncd all
dijkstra:
@$(MAKE) -C dijkstra all
install: $(INSTALL_SBINDIR)/split-image.sh install: $(INSTALL_SBINDIR)/split-image.sh
@$(MAKE) -C imagezip install @$(MAKE) -C imagezip install
@$(MAKE) -C frisbee.redux install @$(MAKE) -C frisbee.redux install
...@@ -50,24 +38,24 @@ endif ...@@ -50,24 +38,24 @@ endif
$(MAKE) -C syncd client-install $(MAKE) -C syncd client-install
$(MAKE) -C growdisk client-install $(MAKE) -C growdisk client-install
$(MAKE) -C dijkstra client-install $(MAKE) -C dijkstra client-install
$(MAKE) -C genhostsfile client-install
remote-install: remote-install:
$(INSTALL) -m 755 -o root -g wheel -d $(LBINDIR) $(INSTALL) -m 755 -o root -g wheel -d $(LBINDIR)
$(INSTALL_PROGRAM) $(SRCDIR)/install-tarfile $(LBINDIR)/install-tarfile $(INSTALL_PROGRAM) $(SRCDIR)/install-tarfile $(LBINDIR)/install-tarfile
$(INSTALL_PROGRAM) $(SRCDIR)/install-rpm $(LBINDIR)/install-rpm $(INSTALL_PROGRAM) $(SRCDIR)/install-rpm $(LBINDIR)/install-rpm
clean: subdir-clean clean: clean-subdirs
subdir-clean:
@$(MAKE) -C imagezip clean
@$(MAKE) -C frisbee.redux clean
@$(MAKE) -C growdisk clean
@$(MAKE) -C syncd clean
distclean: subdir-distclean distclean: subdir-distclean
subdir-distclean: subdir-distclean:
@$(MAKE) -C imagezip distclean @$(MAKE) -C imagezip distclean
# How to recursively descend into subdirectories to make general
# targets such as `all'.
%.MAKE:
@$(MAKE) -C $(dir $@) $(basename $(notdir $@))
%-subdirs: $(addsuffix /%.MAKE,$(SUBDIRS)) ;
.PHONY: $(SUBDIRS) .PHONY: $(SUBDIRS)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment