3 files changed, 12 insertions, 32 deletions
diff --git a/lib/libalpm/Doxyfile b/doc/Doxyfile
index fed75a7e..0d20274b 100644
--- a/lib/libalpm/Doxyfile
+++ b/doc/Doxyfile
@@ -6,7 +6,7 @@
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = libalpm
 PROJECT_NUMBER         = 
-OUTPUT_DIRECTORY       = ../../doc
+OUTPUT_DIRECTORY       = ./
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
@@ -83,31 +83,14 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = alpm.c \
-                         alpm.h \
-                         alpm_list.c \
-                         alpm_list.h \
-                         conflict.c \
-                         db.c \
-                         deps.c \
-                         error.c \
-                         group.c \
-                         handle.c \
-                         log.c \
-                         md5driver.c \
-                         package.c \
-                         server.c \
-                         sha1.c \
-                         sync.c \
-                         trans.c \
-                         versioncmp.c
+INPUT                  = ../lib/libalpm/
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = 
 RECURSIVE              = NO
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = 
-EXCLUDE_SYMBOLS        =
+EXCLUDE_SYMBOLS        = 
 EXAMPLE_PATH           = 
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
@@ -226,7 +209,7 @@ PERL_PATH              = /usr/bin/perl
 # Configuration options related to the dot tool   
 #---------------------------------------------------------------------------
 CLASS_DIAGRAMS         = NO
-MSCGEN_PATH            =
+MSCGEN_PATH            = 
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = YES
 CLASS_GRAPH            = YES
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7a614795..14caa0da 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -10,7 +10,14 @@ if HAS_DOXYGEN
 man_MANS += $(wildcard man3/*.3)
 endif
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_MANS) Doxyfile
+
+if HAS_DOXYGEN
+all: doxygen.in
+
+doxygen.in:
+	doxygen $(srcdir)/Doxyfile
+endif
 
 clean-local:
 	$(RM) man3/*.3
diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am
index be49c297..20e7203d 100644
--- a/lib/libalpm/Makefile.am
+++ b/lib/libalpm/Makefile.am
@@ -9,8 +9,6 @@ DEFS = -DLOCALEDIR=\"@localedir@\" @DEFS@
 
 AM_CFLAGS = -fvisibility=hidden -pedantic -D_GNU_SOURCE -fgnu89-inline
 
-EXTRA_DIST = Doxyfile
-
 libalpm_la_SOURCES = \
 	add.h add.c \
 	alpm.h alpm.c \
@@ -40,12 +38,4 @@ libalpm_la_SOURCES = \
 libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO)
 libalpm_la_LIBADD = -larchive -ldownload
 
-if HAS_DOXYGEN
-all: doxygen.in
-
-doxygen.in:
-	doxygen $(srcdir)/Doxyfile
-
-endif
-
 # vim:set ts=2 sw=2 noet: