git » libjio » commit ddaef1c

diff --git a/.gitignore b/.gitignore
index 24091ee..c009b08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,6 @@ tests/performance/performance
 tests/performance/random
 *.pyc
 *.pyo
-libjio/doc.internal
-libjio/doc.public
+libjio/doxygen/doc.internal
+libjio/doxygen/doc.public
 
diff --git a/libjio/Makefile b/libjio/Makefile
index 4f25361..fecbfda 100644
--- a/libjio/Makefile
+++ b/libjio/Makefile
@@ -83,13 +83,12 @@ install: all
 	$(NICE_CC) $(ALL_CFLAGS) -c $< -o $@
 
 doxygen:
-	doxygen Doxyfile.internal
-	doxygen Doxyfile.public
+	$(MAKE) -C doxygen
 
 clean:
 	rm -f $(OBJS) libjio.a libjio.so libjio.pc jiofsck.o jiofsck
 	rm -f *.bb *.bbg *.da *.gcov *.gcno *.gcda gmon.out
-	rm -rf doc.internal/ doc.public/
+	$(MAKE) -C doxygen $@
 
 
 .PHONY: default all install clean doxygen
diff --git a/libjio/Doxyfile.base b/libjio/doxygen/Doxyfile.base
similarity index 99%
rename from libjio/Doxyfile.base
rename to libjio/doxygen/Doxyfile.base
index b776b32..2812685 100644
--- a/libjio/Doxyfile.base
+++ b/libjio/doxygen/Doxyfile.base
@@ -9,7 +9,7 @@ REPEAT_BRIEF           = YES
 ABBREVIATE_BRIEF       = 
 ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = YES
+FULL_PATH_NAMES        = NO
 STRIP_FROM_PATH        = 
 STRIP_FROM_INC_PATH    = 
 SHORT_NAMES            = NO
@@ -71,7 +71,7 @@ WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = YES
 WARN_FORMAT            = "$file:$line: $text"
 WARN_LOGFILE           = 
-INPUT                  = 
+INPUT                  = ../
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = 
 RECURSIVE              = NO
diff --git a/libjio/Doxyfile.internal b/libjio/doxygen/Doxyfile.internal
similarity index 100%
rename from libjio/Doxyfile.internal
rename to libjio/doxygen/Doxyfile.internal
diff --git a/libjio/Doxyfile.public b/libjio/doxygen/Doxyfile.public
similarity index 85%
rename from libjio/Doxyfile.public
rename to libjio/doxygen/Doxyfile.public
index bbbd2f9..6bcbbab 100644
--- a/libjio/Doxyfile.public
+++ b/libjio/doxygen/Doxyfile.public
@@ -4,5 +4,5 @@ OUTPUT_DIRECTORY = doc.public
 EXTRACT_ALL = YES
 EXTRACT_STATIC = NO
 INTERNAL_DOCS = NO
-FILE_PATTERNS = libjio.h
+INPUT = ../libjio.h
 
diff --git a/libjio/doxygen/Makefile b/libjio/doxygen/Makefile
new file mode 100644
index 0000000..b70d3ce
--- /dev/null
+++ b/libjio/doxygen/Makefile
@@ -0,0 +1,24 @@
+
+ifneq ($(V), 1)
+        NICE_DOXYGEN = @echo "  DOXYGEN  $@"; doxygen
+else
+        NICE_DOXYGEN = doxygen
+endif
+
+
+default: all
+
+all: public internal
+
+public:
+	$(NICE_DOXYGEN) Doxyfile.public
+
+internal:
+	$(NICE_DOXYGEN) Doxyfile.internal
+
+clean:
+	rm -r doc.internal doc.public
+
+
+.PHONY: all clean default doxygen internal public
+