diff options
| author | Tristan Van Berkom <tvb@src.gnome.org> | 2006-12-07 17:44:16 +0000 |
|---|---|---|
| committer | Tristan Van Berkom <tvb@src.gnome.org> | 2006-12-07 17:44:16 +0000 |
| commit | 6cf4c5acc33598f26583431bb83db57a2e34ef46 (patch) | |
| tree | b08c1cfd6ec54dd24d3b0b0468c70da64e41e634 /Makefile.am | |
| parent | 75c655e3c1989e3993eeb4eea974b68a8de82075 (diff) | |
| download | glade-6cf4c5acc33598f26583431bb83db57a2e34ef46.tar.gz | |
New files.
* help/ChangeLog, help/Makefile.am, help/glade.omf.in,
help/.cvsignore, help/C/glade.xml, help/C/legal.xml,
help/C/figures/main-window.png, m4/.cvsignore: New files.
* configure.in:
- Check for gnome-doc-utils and scrollkeeper
- Use AC_CONFIG_FILES instead of AC_OUTPUT with args.
AC_OUTPUT with args is deprecated.
- set macro dir with AC_CONFIG_MACRO_DIR.
* Makefile.am:
- Update for gnome-doc-utils integration.
- Conditionally set SUBDIRS if docs building is enabled.
- Set `ACLOCAL_AMFLAGS = -I m4' as recommended in
Autoconf manual.
* .cvsignore: Add `gnome-doc-utils.make'.
* src/glade-utils.[ch]: New function `glade_util_url_show'.
* src/glade-project-window.c:
- Add functionality for launching the GNOME user manual.
- Set URL hook for GtkAboutDialog.
- If devhelp is not available, the online developer reference
is displayed instead.
* src/glade-paths.sh.in: New variable GLADE_GNOMEHELPDIR.
* glade-3.desktop.in: Add "X-GNOME-DocPath" entry.
Add "GTK" to "Categories".
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 74029da1..a6e361b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,12 @@ ## Process this file with automake to produce Makefile.in +if DISABLE_USER_MANUAL SUBDIRS = src po pixmaps widgets doc +else +SUBDIRS = src po pixmaps widgets doc help +endif + +ACLOCAL_AMFLAGS = -I m4 @INTLTOOL_DESKTOP_RULE@ @@ -26,17 +32,22 @@ update-icon-cache: echo "*** $(gtk_update_icon_cache)"; \ fi - EXTRA_DIST = \ COPYING.GPL \ COPYING.LGPL \ + m4 \ glade-3.desktop.in \ glade-3.png \ intltool-extract.in \ intltool-merge.in \ - intltool-update.in - + intltool-update.in \ + gnome-doc-utils.make CLEANFILES = $(DESKTOP_FILES) -DISTCLEANFILES = intltool-extract intltool-merge intltool-update +DISTCLEANFILES = intltool-extract \ + intltool-merge \ + intltool-update \ + gnome-doc-utils.make + +DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc |