R INSTALL:

2005-03-10  Christian Persch  <chpe@cvs.gnome.org>

	* .cvsignore:
	R INSTALL:
	* autogen.sh:
	* configure.in:
	* data/.cvsignore:
	* po/POTFILES.in:
	* src/.cvsignore:
	* src/Makefile.am:
	* stylesheets/.cvsignore:

	Update the build system, and add missing files to .cvsignore:s.
	Remove not distributed file from POTFILES.in. From bug #169316.

10 files changed, 143 insertions, 244 deletions

diff --git a/.cvsignore b/.cvsignore
index f612cfef..e92fb696 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,6 +7,8 @@ Makefile
 Makefile.in
 mkinstalldirs
 missing
+depcomp
+compile
 po
 intl
 configure
@@ -20,5 +22,4 @@ stamp-h1
 yelp-*.tar.gz
 core*
 autom4te*
-
-
+yelp.desktop.in
diff --git a/ChangeLog b/ChangeLog
index 21addf3e..3b586bd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-03-10  Christian Persch  <chpe@cvs.gnome.org>
+
+	* .cvsignore:
+	R INSTALL:
+	* autogen.sh:
+	* configure.in:
+	* data/.cvsignore:
+	* po/POTFILES.in:
+	* src/.cvsignore:
+	* src/Makefile.am:
+	* stylesheets/.cvsignore:
+
+	Update the build system, and add missing files to .cvsignore:s.
+	Remove not distributed file from POTFILES.in. From bug #169316.
+
 2005-04-06  Shaun McCance  <shaunm@gnome.org>
 
 	* src/Makefile.am:
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index b42a17ac..00000000
--- a/INSTALL
+++ /dev/null
@@ -1,182 +0,0 @@
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
diff --git a/autogen.sh b/autogen.sh
index a0f775b0..03e504b8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME=Yelp
 
-REQUIRED_AUTOMAKE_VERSION=1.7
+REQUIRED_AUTOMAKE_VERSION=1.8
 export REQUIRED_AUTOMAKE_VERSION
 
 if ! test -f $srcdir/src/yelp-main.c; then
@@ -19,4 +19,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-. gnome-autogen.sh
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.in b/configure.in
index 47c3315f..edc6addf 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,8 @@
 AC_INIT([yelp], [2.9.3],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=yelp])
+
+GNOME_COMMON_INIT
+
 AC_CONFIG_SRCDIR(src/yelp-main.c)
 AC_CONFIG_HEADERS(config.h)
 
@@ -22,12 +25,19 @@ AM_PROG_LIBTOOL
 AM_PATH_ORBIT2
 AM_PATH_GLIB_2_0
 
-AC_SUBST([AM_CXXFLAGS])
- 
+GNOME_DEBUG_CHECK
+GNOME_COMPILE_WARNINGS([maximum])
+GNOME_CXX_WARNINGS
+
+if test "x$enable_debug" = "xyes"; then
+	AC_DEFINE([YELP_DEBUG],[1],[Enable Yelp debugging])
+	AM_CFLAGS="$AM_CFLAGS -pedantic -ansi"
+fi
+
 dnl NOTE : it appears that some systems do not like it when you use line
 dnl        continuation charactes to split CFLAGS into readable chunks
 if test "x$GCC" = "xyes"; then
-   CFLAGS="$CFLAGS -Wall -Wno-uninitialized -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-sign-compare"
+   AM_CFLAGS="$AM_CFLAGS -Wall -Wno-uninitialized -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-sign-compare"
 fi
 
 GETTEXT_PACKAGE=yelp
@@ -54,6 +64,8 @@ PKG_CHECK_MODULES(YELP,
 	libxslt >= 1.1.4
 	libexslt >= 0.8.1
 ])
+AC_SUBST([YELP_CFLAGS])
+AC_SUBST([YELP_LIBS])
 
 YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
 
@@ -178,6 +190,15 @@ dnl <= Check for bzip2 > 1.0.0
     dnl =>
 AC_SUBST(BZ_LIBS)
 
+dnl Set flags
+
+AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
+AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS -Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
+
+AC_SUBST([AM_CPPFLAGS])
+AC_SUBST([AM_CFLAGS])
+AC_SUBST([AM_CXXFLAGS])
+
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
diff --git a/data/.cvsignore b/data/.cvsignore
index 04ae059e..e8444d56 100644
--- a/data/.cvsignore
+++ b/data/.cvsignore
@@ -1,3 +1,5 @@
+man.xml
 toc.xml
+yelp.schemas
 Makefile
 Makefile.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c91bea31..0a4d508f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,7 +9,6 @@ src/GNOME_Yelp.server.in
 src/yelp-base.c
 src/yelp-bookmarks.c
 src/yelp-db-pager.c
-src/yelp-db2html.c
 src/yelp-error.c
 src/yelp-io-channel.c
 src/yelp-main.c
diff --git a/src/.cvsignore b/src/.cvsignore
index 9bd11b2b..a83b7aed 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -20,3 +20,4 @@ yelp
 yelp-db2html
 yelp-pregenerate
 core*
+stamp-*
diff --git a/src/Makefile.am b/src/Makefile.am
index dc04fdc9..d7a39902 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,31 +1,36 @@
-# for debugging
-# YELP_CFLAGS += -DYELP_DEBUG -pedantic -ansi -Werror
+bin_PROGRAMS = yelp
+
+yelp_SOURCES =							\
+	$(gnome_yelp_idl_sources)				\
+	yelp-base.c		yelp-base.h			\
+	yelp-bookmarks.c 	yelp-bookmarks.h		\
+	yelp-cache.c		yelp-cache.h			\
+	yelp-db-pager.c		yelp-db-pager.h			\
+	yelp-error.c		yelp-error.h			\
+	yelp-gecko-utils.cpp	yelp-gecko-utils.h		\
+	yelp-html-gecko.c	yelp-html.h			\
+	yelp-io-channel.c	yelp-io-channel.h		\
+	yelp-pager.c		yelp-pager.h			\
+	yelp-settings.c		yelp-settings.h			\
+	yelp-toc-pager.c	yelp-toc-pager.h		\
+	yelp-utils.c		yelp-utils.h			\
+	yelp-window.c 		yelp-window.h			\
+	yelp-xslt-pager.c	yelp-xslt-pager.h		\
+	yelp-marshal-main.c	yelp-main.c
 
 if ENABLE_MAN
-man_sources = yelp-man-parser.c yelp-man-parser.h yelp-man-pager.c yelp-man-pager.h
-else
-man_sources =
+yelp_SOURCES +=					\
+	yelp-man-parser.c yelp-man-parser.h	\
+	yelp-man-pager.c yelp-man-pager.h
 endif
 
 if ENABLE_INFO
-info_sources = yelp-info-pager.c yelp-info-pager.h yelp-info-parser.c yelp-info-parser.h
-else
-info_sources =
+yelp_SOURCES +=					\
+	yelp-info-pager.c yelp-info-pager.h	\
+	yelp-info-parser.c yelp-info-parser.h
 endif
 
-INCLUDES =								\
-	-I$(top_srcdir)							\
-	$(YELP_CFLAGS)							\
-	$(MOZILLA_COMPONENT_CFLAGS)					\
-	-I$(MOZILLA_INCLUDE_ROOT)					\
-	-I$(MOZILLA_INCLUDE_ROOT)/dom					\
-	-I$(MOZILLA_INCLUDE_ROOT)/find					\
-	-I$(MOZILLA_INCLUDE_ROOT)/pref					\
-	-I$(MOZILLA_INCLUDE_ROOT)/webbrwsr				\
-	-I$(MOZILLA_INCLUDE_ROOT)/string				\
-	-I$(MOZILLA_INCLUDE_ROOT)/webshell				\
-	-I$(MOZILLA_INCLUDE_ROOT)/commandhandler			\
-	-include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h		\
+YELP_DEFINES =								\
 	-DG_LOG_DOMAIN=\"Yelp\"						\
 	-DPREFIX=\""$(prefix)"\"					\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"				\
@@ -36,14 +41,43 @@ INCLUDES =								\
 	-DBINDIR=\""$(bindir)"\"					\
 	-DMOZILLA_HOME=\""$(MOZILLA_HOME)\""
 
-bin_PROGRAMS = yelp
-check_PROGRAMS = test-man-parser test-pager test-uri
+mozilla_include_subdirs =	\
+	.		\
+	dom		\
+	find		\
+	gtkembedmoz	\
+	pref		\
+	webbrwsr	\
+	string		\
+	webshell	\
+	commandhandler
+
+yelp_CPPFLAGS =									\
+	-I$(top_srcdir)								\
+	$(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(mozilla_include_subdirs))      \
+	-include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h			\
+	$(YELP_DEFINES)								\
+	$(AM_CPPFLAGS)
+
+yelp_CFLAGS =				\
+	$(YELP_CFLAGS)			\
+	$(AM_CFLAGS)
+
+yelp_CXXFLAGS =				\
+	$(YELP_CFLAGS)			\
+	$(MOZILLA_COMPONENT_CFLAGS)	\
+	$(AM_CXXFLAGS)
+
+yelp_LDADD =				\
+	$(YELP_LIBS)			\
+	$(POPT_LIBS)			\
+	$(Z_LIBS)			\
+	$(BZ_LIBS)			\
+	$(MOZILLA_COMPONENT_LIBS)
 
 yelp_LDFLAGS = -R$(MOZILLA_HOME)
 
-install-exec-local:
-	rm -f $(DESTDIR)$(bindir)/gnome-help
-	ln -s yelp $(DESTDIR)$(bindir)/gnome-help
+check_PROGRAMS = test-man-parser test-pager test-uri
 
 test_man_parser_SOURCES =					\
 	yelp-error.c		yelp-error.h			\
@@ -52,7 +86,15 @@ test_man_parser_SOURCES =					\
 	yelp-utils.c		yelp-utils.h			\
 	test-man-parser.c
 
-test_man_parser_LDADD = @YELP_LIBS@ $(Z_LIBS) $(BZ_LIBS)
+test_man_parser_CPPFLAGS =	\
+	$(YELP_DEFINES)		\
+	$(AM_CPPFLAGS)
+
+test_man_parser_CFLAGS =	\
+	$(YELP_CFLAGS)		\
+	$(AM_CFLAGS)
+
+test_man_parser_LDADD = $(YELP_LIBS) $(Z_LIBS) $(BZ_LIBS)
 
 test_pager_SOURCES =						\
 	yelp-db-pager.c		yelp-db-pager.h			\
@@ -66,35 +108,29 @@ test_pager_SOURCES =						\
 	yelp-xslt-pager.c	yelp-xslt-pager.h		\
 	yelp-marshal-main.c	test-pager.c
 
-test_pager_LDADD = @YELP_LIBS@ $(POPT_LIBS) $(Z_LIBS) $(BZ_LIBS)
+test_pager_CPPFLAGS =		\
+	$(YELP_DEFINES)		\
+	$(AM_CPPFLAGS)
+
+test_pager_CFLAGS =		\
+	$(YELP_CFLAGS)		\
+	$(AM_CFLAGS)
+
+test_pager_LDADD = $(YELP_LIBS) $(POPT_LIBS) $(Z_LIBS) $(BZ_LIBS)
 
 test_uri_SOURCES =					\
 	yelp-utils.c	yelp-utils.h			\
 	test-uri.c
 
-test_uri_LDADD = @YELP_LIBS@
+test_uri_CPPFLAGS =		\
+	$(YELP_DEFINES)		\
+	$(AM_CPPFLAGS)
 
-yelp_SOURCES =							\
-	$(gnome_yelp_idl_sources)				\
-	$(info_sources)						\
-	$(man_sources)						\
-	yelp-base.c		yelp-base.h			\
-	yelp-bookmarks.c 	yelp-bookmarks.h		\
-	yelp-cache.c		yelp-cache.h			\
-	yelp-db-pager.c		yelp-db-pager.h			\
-	yelp-error.c		yelp-error.h			\
-	yelp-gecko-utils.cpp	yelp-gecko-utils.h		\
-	yelp-html-gecko.c	yelp-html.h			\
-	yelp-io-channel.c	yelp-io-channel.h		\
-	yelp-pager.c		yelp-pager.h			\
-	yelp-settings.c		yelp-settings.h			\
-	yelp-toc-pager.c	yelp-toc-pager.h		\
-	yelp-utils.c		yelp-utils.h			\
-	yelp-window.c 		yelp-window.h			\
-	yelp-xslt-pager.c	yelp-xslt-pager.h		\
-	yelp-marshal-main.c	yelp-main.c
+test_uri_CFLAGS =		\
+	$(YELP_CFLAGS)		\
+	$(AM_CFLAGS)
 
-yelp_LDADD = @YELP_LIBS@ $(POPT_LIBS) $(Z_LIBS) $(BZ_LIBS) $(MOZILLA_COMPONENT_LIBS)
+test_uri_LDADD = $(YELP_LIBS)
 
 serverdir = $(libdir)/bonobo/servers
 server_in_files = GNOME_Yelp.server.in
@@ -136,12 +172,16 @@ CLEANFILES =								\
 
 MAINTAINERCLEANFILES = stamp-yelp-marshal.h $(BUILT_SOURCES)
 
-distclean-local:
-	if test $(srcdir) != .; then \
-	  rm -f $(MAINTAINERCLEANFILES); \
-	fi
-
 EXTRA_DIST =								\
 	yelp-marshal.list						\
 	$(server_in_files)						\
 	$(server_DATA)
+
+install-exec-local:
+	rm -f $(DESTDIR)$(bindir)/gnome-help
+	ln -s yelp $(DESTDIR)$(bindir)/gnome-help
+
+distclean-local:
+	if test $(srcdir) != .; then \
+	  rm -f $(MAINTAINERCLEANFILES); \
+	fi
diff --git a/stylesheets/.cvsignore b/stylesheets/.cvsignore
index 3568ef2f..219709c5 100644
--- a/stylesheets/.cvsignore
+++ b/stylesheets/.cvsignore
@@ -1,3 +1,5 @@
 Makefile
 Makefile.in
 l10n.xml
+db2html.xsl
+db-title.xsl