faq, man, manual moved to doc/; fix automake warnings

diff --git a/ChangeLog-gtk2 b/ChangeLog-gtk2
index 97fa295652a5f724cd55b14472c091beae685cba..2c9b29e47cce380ce2b09fdffe7777f2ff0971fb 100644 (file)
--- a/ChangeLog-gtk2
+++ b/ChangeLog-gtk2
@@ -1,3 +1,19 @@
+2004-01-08 Thorsten Maerz <torte@netztorte.de>
+       * configure.ac
+         Makefile.am
+         doc/.cvsignore
+         doc/Makefile.am
+               faq, man, manual moved to doc/
+       * ac/aspell.m4
+         ac/check-type.m4
+         ac/gnupg-check-typedef.m4
+         ac/openssl.m4
+         ac/spamassassin.m4
+         ac/missing/gdk-pixbuf.m4
+         ac/missing/gpgme.m4
+         ac/missing/imlib.m4
+               fix automake warnings
+
 2003-12-06 Colin Leroy <colin@colino.net>
        * src/summaryview.c
                Fix quicksearch

diff --git a/Makefile.am b/Makefile.am
index 97c77bd1d10e8bfe60466f52602b3cde9b0f3c20..ec99d3ef9dd9565930ddd4f041af88d664a7d395 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = ac po src man manual faq tools config
+SUBDIRS = ac po src tools config doc
 
 EXTRA_DIST = \
        ChangeLog.claws \

diff --git a/ac/aspell.m4 b/ac/aspell.m4
index 1103ec8541eee70b2fd32cd65c76827c8d67f032..040692d443cf08619ecde19dbfad1e876d2f201f 100644 (file)
--- a/ac/aspell.m4
+++ b/ac/aspell.m4
@@ -9,7 +9,7 @@ dnl AM_PATH_ASPELL([MINIMUM-VERSION,
 dnl               [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for aspell, and define ASPELL_CFLAGS, ASPELL_LIBS and ASPELL_PATH
 dnl
-AC_DEFUN(AM_PATH_ASPELL,
+AC_DEFUN([AM_PATH_ASPELL],
 [dnl
 dnl Get the cflags and libraries from the aspell-config script
 dnl

diff --git a/ac/check-type.m4 b/ac/check-type.m4
index 90611451bd2320be7179377a0f18e207b643c891..e65ea03b33371ffa02a27fef1f049079f96e5381 100644 (file)
--- a/ac/check-type.m4
+++ b/ac/check-type.m4
@@ -5,7 +5,7 @@ dnl `stddef.h' checks files included by INCLUDES, which should be a
 dnl series of #include statements.  If TYPE is not defined, define it
 dnl to DEFAULT.
 dnl
-AC_DEFUN(SYLPHEED_CHECK_TYPE,
+AC_DEFUN([SYLPHEED_CHECK_TYPE],
 [AC_REQUIRE([AC_HEADER_STDC])dnl
 AC_MSG_CHECKING(for $1)
 AC_CACHE_VAL(sylpheed_cv_type_$1,

diff --git a/ac/gnupg-check-typedef.m4 b/ac/gnupg-check-typedef.m4
index b53e2ab2fdbcfadd6d85010242e1b048f853b26e..1dd7c4711282e0cd9c4d19a6caf5a6e5dd5255d9 100644 (file)
--- a/ac/gnupg-check-typedef.m4
+++ b/ac/gnupg-check-typedef.m4
@@ -1,7 +1,7 @@
 dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME [, COMMENT])
 dnl Check whether a typedef exists and create a #define $2 if it exists
 dnl
-AC_DEFUN(GNUPG_CHECK_TYPEDEF,
+AC_DEFUN([GNUPG_CHECK_TYPEDEF],
   [ AC_MSG_CHECKING(for $1 typedef)
     AC_CACHE_VAL(gnupg_cv_typedef_$1,
     [AC_TRY_COMPILE([#include <stdlib.h>

diff --git a/ac/missing/gdk-pixbuf.m4 b/ac/missing/gdk-pixbuf.m4
index 9da7a6a65b9893333847f5b1409941e0a374815d..581903e082d8fc83854a03eed5afe239b85007b6 100644 (file)
--- a/ac/missing/gdk-pixbuf.m4
+++ b/ac/missing/gdk-pixbuf.m4
@@ -9,7 +9,7 @@
 dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS
 dnl
-AC_DEFUN(AM_PATH_GDK_PIXBUF,
+AC_DEFUN([AM_PATH_GDK_PIXBUF],
 [dnl 
 dnl Get the cflags and libraries from the gdk-pixbuf-config script
 dnl

diff --git a/ac/missing/gpgme.m4 b/ac/missing/gpgme.m4
index 1fb026057eefeaa4321ba156bbb35f359ebf7807..89b4aed0259574cd350a224605a7d00dc4bfd2d3 100644 (file)
--- a/ac/missing/gpgme.m4
+++ b/ac/missing/gpgme.m4
@@ -9,7 +9,7 @@ dnl AM_PATH_GPGME([MINIMUM-VERSION,
 dnl               [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for gpgme, and define GPGME_CFLAGS and GPGME_LIBS
 dnl
-AC_DEFUN(AM_PATH_GPGME,
+AC_DEFUN([AM_PATH_GPGME],
 [dnl
 dnl Get the cflags and libraries from the gpgme-config script
 dnl

diff --git a/ac/missing/imlib.m4 b/ac/missing/imlib.m4
index cbff0c932131652ff55ca0c310c2aaa55b88abf6..8ce387a869c24120328f8ea8230ec0c433de1848 100644 (file)
--- a/ac/missing/imlib.m4
+++ b/ac/missing/imlib.m4
@@ -6,7 +6,7 @@
 dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS
 dnl
-AC_DEFUN(AM_PATH_IMLIB,
+AC_DEFUN([AM_PATH_IMLIB],
 [dnl 
 dnl Get the cflags and libraries from the imlib-config script
 dnl

diff --git a/ac/openssl.m4 b/ac/openssl.m4
index ad2013dd729c97914889d46eaba199e507fda49d..0e518e46d5b121620bb1682a7d26fed53c0e81d7 100644 (file)
--- a/ac/openssl.m4
+++ b/ac/openssl.m4
@@ -2,7 +2,7 @@ dnl ******************************
 dnl OpenSSL
 dnl ******************************
 
-AC_DEFUN(AM_PATH_OPENSSL,
+AC_DEFUN([AM_PATH_OPENSSL],
 [dnl
        USE_OPENSSL=0
 
@@ -73,4 +73,4 @@ AC_DEFUN(AM_PATH_OPENSSL,
 
        AC_SUBST(OPENSSL_CFLAGS)
        AC_SUBST(OPENSSL_LIBS)
-])
\ No newline at end of file
+])

diff --git a/ac/spamassassin.m4 b/ac/spamassassin.m4
index 67e4a97f54d72b1362523dcce0b6df4fcfd91602..d0a4b8ee9c1b17ce5c62e7f0a5b35242fa2ee25b 100644 (file)
--- a/ac/spamassassin.m4
+++ b/ac/spamassassin.m4
@@ -1,6 +1,6 @@
 dnl check for libspamc required includes
 
-AC_DEFUN(AC_SPAMASSASSIN,
+AC_DEFUN([AC_SPAMASSASSIN],
 [dnl
 
 AC_CHECK_HEADERS(sys/time.h syslog.h unistd.h errno.h sys/errno.h)
@@ -93,4 +93,4 @@ if test "$USE_OPENSSL" -ne 0; then
     AC_DEFINE(SPAMC_SSL, 1, Compile libspamc with OpenSSL support)
 fi
 
-])
\ No newline at end of file
+])

diff --git a/configure.ac b/configure.ac
index 78ae27fd37f95dc0d0773d6a133c9f6c5f348e10..2814651dfcf7bcf70fb9e2f3e2d962ea37533089 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -552,19 +552,20 @@ src/plugins/image_viewer/Makefile
 src/plugins/trayicon/Makefile
 src/plugins/trayicon/libeggtrayicon/Makefile
 src/plugins/clamav/Makefile
-faq/Makefile
-faq/de/Makefile
-faq/en/Makefile
-faq/es/Makefile
-faq/fr/Makefile
-faq/it/Makefile
-man/Makefile
-manual/Makefile
-manual/de/Makefile
-manual/en/Makefile
-manual/es/Makefile
-manual/fr/Makefile
-manual/ja/Makefile
+doc/Makefile
+doc/faq/Makefile
+doc/faq/de/Makefile
+doc/faq/en/Makefile
+doc/faq/es/Makefile
+doc/faq/fr/Makefile
+doc/faq/it/Makefile
+doc/man/Makefile
+doc/manual/Makefile
+doc/manual/de/Makefile
+doc/manual/en/Makefile
+doc/manual/es/Makefile
+doc/manual/fr/Makefile
+doc/manual/ja/Makefile
 tools/Makefile
 config/Makefile
 sylpheed-claws.pc