X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=Makefile;h=fed3139a3c7b0507aec9e86667c7a0459fea3261;hb=d48e5ceb9e4539f32df76804ff878a10dadcba35;hp=4e2a9cce206c1e52ac5376a41a68f1f523075f2e;hpb=4796e2275dab7a87639758084db9f01221c539a5;p=rrq%2Foverlay-boot.git

diff --git a/Makefile b/Makefile
index 4e2a9cc..fed3139 100644
--- a/Makefile
+++ b/Makefile
@@ -1,49 +1,67 @@
 SBINDIR = $(DESTDIR)/usr/sbin
-ETCDIR = $(DESTDIR)/etc/rrqnet
-MAN1DIR = $(DESTDIR)/usr/share/man/man1
+#ETCDIR = $(DESTDIR)/etc/overlay
+#MAN1DIR = $(DESTDIR)/usr/share/man/man1
 MAN8DIR = $(DESTDIR)/usr/share/man/man8
 VARLIBDIR = $(DESTDIR)/var/lib/overlay-boot
 
-SBINCFILES =
+#SBINCFILES =
 #SBINFILES = overlay-boot overlay-go overlay-stop
-ETCFILES =
-MAN1FILES = 
-MAN8FILES = overlay-boot.8 overlay-go.8 overlay-stop.8
-HTMLDOC = $(MAN8FILES:%=%.html)
+# The SBINFILES are installed via links; see debian/overlay-boot.links
+#ETCFILES =
+#MAN1FILES = 
+MAN8FILES = overlay-boot.8 overlay-go.8 overlay-stop.8 overlay-diskfile.8
+#HTMLDOC = $(MAN8FILES:%=%.html)
 VARLIBFILES = overlay-boot overlay-go overlay-stop functions reaper
+VARLIBFILES += overlay-init overlay-postmount overlay-premount
+VARLIBFILES += overlay-diskfile
 
-all: asm/reaper
+# The default is to build asm/reaper
+REAPER = src/reaper
+all: $(REAPER)
 
-asm/reaper: 
-	$(MAKE) -C asm reaper
+# Specific rule: $(REAPER) is ensured by "recursive make"
+$(REAPER): 
+	$(MAKE) -C $$(dirname $(REAPER)) reaper
 
-overlay-boot.8: README.adoc
+# Specific rule: the reaper program originates from $(REAPER)
+reaper: $(REAPER)
+	mv $< $@
+
+# Generic rule: any dependee directory needs to be created
+%/:
+	mkdir -p $@
+
+# Generic rule: a local .8 file depends on the same .8.adoc file, if any
+$(MAN8FILES): %: %.adoc
 	a2x -d manpage -f manpage $^
 
-$(addprefix $(MAN8DIR)/,$(MAN8FILES)): overlay-boot.8 | $(MAN8DIR)/
+# Generic rule: an installed MAN8FILE file depends on a local the
+# same, and that the installation directory exists
+$(addprefix $(MAN8DIR)/,$(MAN8FILES)): $(MAN8DIR)/%: % | $(MAN8DIR)/
 	cp $< $@
 
-$(MAN8DIR)/ $(VARLIBDIR)/:
-	mkdir -p $@
-
+# Generic rule: an installed VARLIBFILES file depends on a local the
+# same, and that the installation directory exists
 $(addprefix $(VARLIBDIR)/,$(VARLIBFILES)): $(VARLIBDIR)/%: % | $(VARLIBDIR)/
 	cp -p $< $@
 
-$(VARLIBDIR)/reaper: asm/reaper
-#	cp $< $@
-
+# Make target: to clean up this workspace
 clean:
-	rm -f reaper overlay-boot.8 asm/reaper
-	dh_clean -d
+	rm -f reaper *.8
+	make -C $$(dirname $(REAPER)) clean
 
-INSTALLTARGETS = $(addprefix $(SBINDIR)/,$(SBINFILES))
-INSTALLTARGETS += $(addprefix $(ETCDIR)/,$(ETCFILES))
-INSTALLTARGETS += $(addprefix $(MAN1DIR)/,$(MAN1FILES))
+.INTERMEDIATE: reaper $(MAN8FILES)
+
+# Make target: enumerates that which should be installed
+#INSTALLTARGETS = $(addprefix $(SBINDIR)/,$(SBINFILES))
+#INSTALLTARGETS += $(addprefix $(ETCDIR)/,$(ETCFILES))
+#INSTALLTARGETS += $(addprefix $(MAN1DIR)/,$(MAN1FILES))
 INSTALLTARGETS += $(addprefix $(MAN8DIR)/,$(MAN8FILES))
 INSTALLTARGETS += $(addprefix $(VARLIBDIR)/,$(VARLIBFILES))
-
 install: $(INSTALLTARGETS)
 
+# Make target: make a .deb file in ../
 BUILDPACKAGE = -us -uc --build=full -Iolle
 deb:
-	PREFIX= INCLUDE_PREFIX=/usr dpkg-buildpackage $(BUILDPACKAGE)
+	dpkg-buildpackage $(BUILDPACKAGE)
+#	PREFIX= INCLUDE_PREFIX=/usr