Makefileで*.dが作成されない問題を修正。また、srcディレクトリーでdistcleanとcleanターゲットを設定

[YACASL2.git] / Makefile

diff --git a/Makefile b/Makefile
index c1b6483..d85cacc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,10 @@
 .PHONY: all build gtags \
         check \
-        doc info html doc-inner \
+        doc alldoc doc_inner \
         install uninstall \
-        install-info uninstall-info \
-        install-casl2lib uninstall-casl2lib \
         version gittag \
         clean src-clean gtags-clean \
-        test-clean doc-clean doc-inner-clean
+        test-clean doc-clean doc_inner-clean
 
 CMD := casl2 comet2 dumpword
 
@@ -44,13 +42,7 @@ INSTALL: doc/install.txt
 alldoc:
        $(MAKE) -C doc all
 
-info:
-       $(MAKE) -C doc info
-
-html:
-       $(MAKE) -C doc html
-
-doc-inner:
+doc_inner:
        $(MAKE) -C doc_inner all
 
 check:
@@ -63,18 +55,6 @@ install: casl2 comet2 dumpword install-info install-casl2lib
 uninstall: uninstall-info uninstall-casl2lib
        $(RM) $(prefix $(bindir)/,$(CMD))
 
-install-info:
-       $(MAKE) -C doc install-info
-
-uninstall-info:
-       $(MAKE) -C doc uninstall-info
-
-install-casl2lib:
-       $(MAKE) -C as/casl2lib install-casl2lib
-
-uninstall-casl2lib:
-       $(MAKE) -C as/casl2lib uninstall-casl2lib
-
 version: $(VERSIONFILES)
        @$(ECHO) "YACASL2 Version: $(VERSION)"
 
@@ -84,25 +64,30 @@ $(VERSIONFILES): VERSION
 gittag: VERSION
        $(GITTAG) $(VERSION)
 
-clean: cmd-clean src-clean gtags-clean doc-clean doc-inner-clean version-clean
+distclean: cmd-clean src-distclean gtags-clean version-clean clean
+
+clean: src-clean doc-clean doc_inner-clean
 
 cmd-clean:
-       @$(RM) $(CMD)
+       $(RM) $(CMD)
 
 src-clean:
-       @$(MAKE) -sC src clean
+       $(MAKE) -sC src clean
+
+src-distclean:
+       $(MAKE) -sC src distclean
 
 gtags-clean:
-       @$(RM) GPATH GRTAGS GSYMS GTAGS
+       $(RM) GPATH GRTAGS GSYMS GTAGS
 
 doc-clean:
-       @$(MAKE) -sC doc clean
+       $(MAKE) -sC doc clean
 
-doc-inner-clean:
-       @$(MAKE) -sC doc_inner clean
+doc_inner-clean:
+       $(MAKE) -sC doc_inner clean
 
 version-clean:
-       @$(RM) $(VERSIONFILES)
+       $(RM) $(VERSIONFILES)
 
 test-clean:
-       @$(MAKE) -sC test clean
+       $(MAKE) -sC test clean