Fix doxyfile location.

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@620 36d66b0a-2a48-0410-832c-cd162a569da5

diff --git a/Makefile.am b/Makefile.am
index f65a4e7..a3ff5b3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = FAQ doxyfile docs misc
+EXTRA_DIST = FAQ docs misc
 SUBDIRS = \
        lib \
        src \

diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644 (file)
index 39b954c..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,53 +0,0 @@
-dnl MODULE_HELPER(NAME, HELP, DEFAULT, COMMANDS)
-AC_DEFUN([MODULE_HELPER],[
-       unset have_module
-       AC_ARG_ENABLE([$1], [$2],,[
-               if test "x${enable_all}" = "xdefault"; then
-                       enable_[$1]=[$3]
-               else
-                       enable_[$1]="${enable_all}"
-               fi
-       ])
-       if test "x${enable_[$1]}" != "xno"; then
-               $4
-               AC_MSG_CHECKING([whether to build $1 module])
-               if test -n "${have_module+set}"; then
-                       if test "x${enable_[$1]}" = "xauto"; then
-                               if test "x${enable_plugins}" != "xno"; then
-                                       AC_MSG_RESULT([yes, as plugin]) 
-                                       build_static=no
-                                       build_shared=yes
-                               else
-                                       AC_MSG_RESULT([yes]) 
-                                       build_static=yes
-                                       build_shared=no
-                               fi
-                       elif test "x${enable_[$1]}" = "xshared"; then
-                               if test "x${enable_plugins}" != "xno"; then
-                                       AC_MSG_RESULT([yes, as plugin]) 
-                                       build_static=no
-                                       build_shared=yes
-                               else
-                                       AC_MSG_RESULT([no]) 
-                                       AC_MSG_ERROR([Can't build [$1] module, plugins are disabled])
-                               fi
-                       else
-                               AC_MSG_RESULT([yes]) 
-                               build_static=yes
-                               build_shared=no
-                       fi
-               elif test "x${enable_[$1]}" != "xauto"; then
-                       AC_MSG_RESULT([no]) 
-                       AC_MSG_ERROR([Unable to build $1 plugin, see messages above])
-               else    
-                       AC_MSG_RESULT([no]) 
-                       build_static=no
-                       build_shared=no
-               fi
-       else
-               AC_MSG_CHECKING([whether to build $1 module])
-               AC_MSG_RESULT([no]) 
-               build_static=no
-               build_shared=no
-       fi
-])

diff --git a/doxyfile b/docs/doxyfile
similarity index 98%
rename from doxyfile
rename to docs/doxyfile
index d752e08..1257eff 100644 (file)
--- a/doxyfile
+++ b/docs/doxyfile
@@ -8,7 +8,7 @@ PROJECT_NAME           = "cryptsetup API"
 PROJECT_NUMBER         =
 PROJECT_BRIEF          = "Public cryptsetup API"
 PROJECT_LOGO           =
-OUTPUT_DIRECTORY       = docs/doxygen_api_docs
+OUTPUT_DIRECTORY       = doxygen_api_docs
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
@@ -91,7 +91,7 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = "docs/doxygen_index" "lib/libcryptsetup.h"
+INPUT                  = "doxygen_index" "../lib/libcryptsetup.h"
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          =
 RECURSIVE              = NO
@@ -99,7 +99,7 @@ EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       =
 EXCLUDE_SYMBOLS        =
-EXAMPLE_PATH           = "docs/examples"
+EXAMPLE_PATH           = "examples"
 EXAMPLE_PATTERNS       =
 EXAMPLE_RECURSIVE      = NO
 IMAGE_PATH             =

diff --git a/docs/doxygen_index b/docs/doxygen_index
index 055093d..aa004f8 100644 (file)
--- a/docs/doxygen_index
+++ b/docs/doxygen_index
@@ -104,7 +104,7 @@
  * LD_LIBRARY_PATH=../../lib/.libs ./crypt_luks_usage _path_to_[block_device]_file
  * @endcode
  *
- *                     Note that you need to have the cryptsetup library compiled. @include crypt_log_usage.c
+ *                     Note that you need to have the cryptsetup library compiled. @include crypt_luks_usage.c
  *
  *     @section clog crypt_log_usage - cryptsetup logging API example
  *