Adjust Makefiles to match those in our other repos

by filling out the top Makefile (including adding an install-doc target) and changing the realclean target everywhere to full_clean
kammoh · Mar 22, 2021 · 00178ac · 00178ac
1 parent d94459d
commit 00178ac
Show file tree

Hide file tree

Showing 16 changed files with 61 additions and 37 deletions.
diff --git a/Makefile b/Makefile
@@ -7,9 +7,34 @@ PREFIX?=$(TOP)/inst
 .PHONY: all
 all: install
 
-$(PREFIX):
-	mkdir -p $@
+# -------------------------
 
-.PHONY: install clean realclean
-install clean realclean: $(PREFIX)
-	make -C src  PREFIX=$(PREFIX)  $@
+.PHONY: rem_inst
+rem_inst:
+	rm -fr $(PREFIX)
+
+.PHONY: rem_build
+rem_build:
+	rm -fr $(BUILDDIR)
+
+# -------------------------
+
+.PHONY: install
+install:
+	$(MAKE)  -C src  PREFIX=$(PREFIX)  install
+
+.PHONY: install-doc
+install-doc:
+	$(MAKE)  -C doc  PREFIX=$(PREFIX)  install
+
+# -------------------------
+
+clean: rem_inst rem_build
+	-$(MAKE)  -C src  clean
+	-$(MAKE)  -C doc  clean
+
+full_clean: rem_inst rem_build
+	-$(MAKE)  -C src  full_clean
+	-$(MAKE)  -C doc  full_clean
+
+# -------------------------
diff --git a/README.md b/README.md
@@ -101,7 +101,7 @@ For viewing scheduling graphs visually:
 
 You can install with:
 
-    $ make
+    $ make install
 
 And then you can run with:
 
@@ -112,10 +112,9 @@ And then you can run with:
 ## Documenation
 
 The `doc` directory contains a User Guide written in LaTeX.
-You can build `user_guide.pdf` with:
+You can build and install the `user_guide.pdf` with:
 
-    $ cd doc/
-    $ make
+    $ make install-doc
 
 This requires LaTex tools, such as `pdflatex`.
 

diff --git a/doc/Makefile b/doc/Makefile
@@ -30,14 +30,14 @@ INCLUDES = \
 	version.tex \
 	bluetcl.tex \
 
-.PHONY: doc clean realclean
+.PHONY: doc clean full_clean
 
 doc:	$(DOC).pdf
 
 clean:
 	${RM} -f *.dvi *.ps *.pdf figures/*.pdf
 
-realclean: clean
+full_clean: clean
 	${RM} -f *.log *.aux *.blg *.bbl *.toc *.out *.idx *.ind *.ilg user_guide.cdx user_guide.cnd
 
 $(DOC).dvi: $(DOC).tex

diff --git a/src/Makefile b/src/Makefile
@@ -9,8 +9,8 @@ all: install
 $(PREFIX):
 	mkdir -p $@
 
-.PHONY: install clean realclean
-install clean realclean: $(PREFIX)
+.PHONY: install clean full_clean
+install clean full_clean: $(PREFIX)
 	make -C emacs          PREFIX=$(PREFIX) $@
 	make -C exec           PREFIX=$(PREFIX) $@
 	make -C gvim           PREFIX=$(PREFIX) $@

diff --git a/src/emacs/Makefile b/src/emacs/Makefile
@@ -20,7 +20,7 @@ install:
 	install -d -m755 $(TARGETDIR)
 	install -m644 $(FILES) $(TARGETDIR)
 
-.PHONY: clean realclean	
-realclean: clean
+.PHONY: clean full_clean	
+full_clean: clean
 
 clean:
diff --git a/src/exec/Makefile b/src/exec/Makefile
@@ -15,7 +15,7 @@ install:
 	install -d -m755 $(TARGETDIR)
 	install -m755 fixvcd.pl $(TARGETDIR)/fixvcd
 
-.PHONY: clean realclean
-realclean: clean
+.PHONY: clean full_clean
+full_clean: clean
 
 clean:
diff --git a/src/gvim/Makefile b/src/gvim/Makefile
@@ -19,7 +19,7 @@ install:
 	install -d -m755 $(TARGETDIR)
 	install -m644 $(FILES) $(TARGETDIR)
 
-.PHONY: clean realclean	
-realclean: clean
+.PHONY: clean full_clean	
+full_clean: clean
 
 clean:
diff --git a/src/iwidgets4.0.1/Makefile b/src/iwidgets4.0.1/Makefile
@@ -24,6 +24,6 @@ install:
 		$(MAKE) -C $(dir) LIBDIR=$(abspath $(TARGETDIR)/$(dir)) $@ ; )
 
 
-.PHONY: clean realclean
-clean realclean:
+.PHONY: clean full_clean
+clean full_clean:
 
diff --git a/src/iwidgets4.0.1/generic/Makefile b/src/iwidgets4.0.1/generic/Makefile
@@ -19,6 +19,6 @@ install:
 	$(INSTALL) -m 644 $(FILES) $(LIBDIR)
 
 
-.PHONY: clean realclean
-clean realclean:
+.PHONY: clean full_clean
+clean full_clean:
 
diff --git a/src/novas/Makefile b/src/novas/Makefile
@@ -19,7 +19,7 @@ install:
 TAGS: */*.tcl
 	ctags -R -e
 
-.PHONY: clean realclean
-realclean clean:
+.PHONY: clean full_clean
+full_clean clean:
 	rm -f TAGS
 	make -C etc $@
diff --git a/src/novas/etc/Makefile b/src/novas/etc/Makefile
@@ -45,8 +45,8 @@ install: tclIndex
 .PHONY: TAGS
 TAGS: ../TAGS
 
-.PHONY: clean realclean
-realclean: clean
+.PHONY: clean full_clean
+full_clean: clean
 
 clean:
 	@-rm -f tclIndex pkg_mkIndex.tcl pkgIndex.tcl
diff --git a/src/novas/etc/wave/Makefile b/src/novas/etc/wave/Makefile
@@ -21,7 +21,7 @@ install:
 .PHONY: TAGS
 TAGS: ../TAGS
 
-.PHONY: clean realclean
-realclean: clean
+.PHONY: clean full_clean
+full_clean: clean
 
 clean:
diff --git a/src/tk/Makefile b/src/tk/Makefile
@@ -27,8 +27,8 @@ install: tclIndex
 	install -m644 tclIndex $(TCLFILES) $(TARGETDIR)
 
 
-.PHONY: clean realclean	
-realclean: clean
+.PHONY: clean full_clean	
+full_clean: clean
 
 clean:
 	rm -f pkgIndex.tcl tclIndex
diff --git a/src/util/Makefile b/src/util/Makefile
@@ -58,8 +58,8 @@ TAGS:
 	make -C .. TAGS
 	ln -s ../TAGS
 
-.PHONY: clean realclean
-realclean: clean
+.PHONY: clean full_clean
+full_clean: clean
 	-rm -f TAGS
 
 clean:

diff --git a/src/workstation/Makefile b/src/workstation/Makefile
@@ -114,8 +114,8 @@ TAGS: *.tcl
 tags: *.tcl
 	ctags $+
 
-.PHONY: clean realclean clean-tix
-clean realclean: clean-tix
+.PHONY: clean full_clean clean-tix
+clean full_clean: clean-tix
 	@rm -rf tclIndex pkgIndex.tcl version_commands.tcl logs help TAGS tags
 
 clean-tix:

diff --git a/src/workstation/images/Makefile b/src/workstation/images/Makefile
@@ -84,7 +84,7 @@ install:
 	install -d -m755 $(TARGETDIR)
 	install -m644 $(IMAGEFILES) $(TARGETDIR)
 
-.PHONY: clean realclean
-realclean: clean
+.PHONY: clean full_clean
+full_clean: clean
 
 clean: