update doc Makefile targets

diff --git a/Doxyfile b/Doxyfile
index 0991519..6be206c 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NUMBER         =
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = build/firm-doc
+OUTPUT_DIRECTORY       = build/doc
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -1302,7 +1302,7 @@ TAGFILES               =
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       = build/firm-doc/libfirm.tag
+GENERATE_TAGFILE       = build/doc/libfirm.tag
 
 # If the ALLEXTERNALS tag is set to YES all external classes will be listed
 # in the class index. If set to NO only the inherited external classes

diff --git a/Makefile b/Makefile
index 2198e24..4436a66 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ variant      ?= debug
 
 srcdir       ?= $(top_srcdir)
 builddir     ?= $(top_builddir)/$(variant)
-docdir       ?= $(top_builddir)/firm-doc
+docdir       ?= $(top_builddir)/doc
 
 # This hides the noisy commandline outputs. You can see them with "make Q="
 Q ?= @
@@ -179,17 +179,17 @@ $(builddir)/%.o: %.c $(IR_SPEC_GENERATED_FILES) config.h
        $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(libfirm_CPPFLAGS) -MMD -c -o $@ $<
 
 $(docdir)/libfirm.tag: $(IR_SPEC_GENERATED_FILES) Doxyfile $(wildcard include/libfirm/*.h) $(wildcard include/libfirm/adt/*.h)
-       @echo Doxygen
+       @echo Doxygen $@
        $(Q)$(DOXYGEN)
 
 DOCU_GENERATOR := scripts/gen_docu.py
 $(docdir)/html/nodes.html: $(docdir)/libfirm.tag $(DOCU_GENERATOR) $(IR_SPEC) scripts/spec_util.py scripts/style.css
-       @echo gen_docu.py
+       @echo gen_docu.py $@
        $(Q)$(DOCU_GENERATOR) $(docdir)/libfirm.tag "" $@
        $(Q)cp scripts/style.css $(docdir)/html
 
-.PHONY: documentation
-documentation: $(docdir)/libfirm.tag $(docdir)/html/nodes.html
+.PHONY: doc
+doc: $(docdir)/libfirm.tag $(docdir)/html/nodes.html
 
 .PHONY: clean
 clean: