Makefileの修正

diff --git a/Makefile b/Makefile
index c1b6483..ad22d42 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,7 @@
 .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
@@ -44,12 +42,6 @@ INSTALL: doc/install.txt
 alldoc:
        $(MAKE) -C doc all
 
-info:
-       $(MAKE) -C doc info
-
-html:
-       $(MAKE) -C doc html
-
 doc-inner:
        $(MAKE) -C doc_inner all
 
@@ -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,27 @@ $(VERSIONFILES): VERSION
 gittag: VERSION
        $(GITTAG) $(VERSION)
 
-clean: cmd-clean src-clean gtags-clean doc-clean doc-inner-clean version-clean
+distclean: cmd-clean 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
 
 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
+       $(MAKE) -sC doc_inner clean
 
 version-clean:
-       @$(RM) $(VERSIONFILES)
+       $(RM) $(VERSIONFILES)
 
 test-clean:
-       @$(MAKE) -sC test clean
+       $(MAKE) -sC test clean

diff --git a/doc/install-info.mk b/doc/install-info.mk
index 9193d2a..1869919 100644 (file)
--- a/doc/install-info.mk
+++ b/doc/install-info.mk
@@ -10,9 +10,9 @@ INSTALL-INFO := install-info
 install-info: yacasl2.info
        $(INSTALL) -d $(infodir)
        $(INSTALL) $< $(infodir)/
-       $(INSTALL-INFO) $(infodir)/$< $(infodir)/dir
-       $(GZIP) -f $(infodir)/$<
+       $(INSTALL-INFO) $(infodir)/$(notdir $<) $(infodir)/dir
+       $(GZIP) -f $(infodir)/$(notdir $<)
 
 uninstall-info:
-       $(INSTALL-INFO) --delete $(addprefix $(infodir)/,$(TARGETS)) $(infodir)/dir
-       $(RM) $(addprefix $(infodir)/,$(TARGETS))
+       $(INSTALL-INFO) --delete $(addprefix $(infodir)/,$(notdir $(TARGET))) $(infodir)/dir
+       $(RM) $(addprefix $(infodir)/,$(notdir $(TARGET)))

diff --git a/doc/texinfo.mk b/doc/texinfo.mk
index b0a5f01..57c32b1 100644 (file)
--- a/doc/texinfo.mk
+++ b/doc/texinfo.mk
@@ -1,6 +1,6 @@
-.PHONY: texinfo-distclean textmp-clean
+.PHONY: texinfo-distclean texinfo-clean texinfo-textmp-clean
 
-CP ?= cp
+CP := cp
 DVIPDFMX := dvipdfmx
 INSTALL-INFO := install-info
 MKDIR := mkdir
@@ -29,10 +29,10 @@ TEXI2DVI_FLAGS ?= -q --texinfo=@afourpaper
 %.txt: %.texi
        $(MAKEINFO) --no-headers --disable-encoding -o $@ $<
 
-texinfo-distclean: textmp-clean
+texinfo-distclean: texinfo-clean
        @$(RMR) *_html *.info *.html *.pdf  *.dvi *.txt
 
-texinfo-clean: textmp-clean
+texinfo-clean: texinfo-textmp-clean
 
-textmp-clean:
+textmp-textmp-clean:
        @$(RM) *.aux *.cp *.cps *.fn *.ky *.log *.pg *.pgs *.tmp *.toc *.tp *.vr