diff options
| author | David King <amigadave@amigadave.com> | 2015-10-21 15:10:32 +0100 |
|---|---|---|
| committer | David King <amigadave@amigadave.com> | 2015-10-23 13:30:28 +0100 |
| commit | d93027a5710d78b0060555c7910a0db97a91c9cd (patch) | |
| tree | 9ff996eb116b87ed5016a74d8633f53c66783af1 | |
| parent | a7c0388a5641a976246cf195f3d9e087a53e7bca (diff) | |
| download | yelp-d93027a5710d78b0060555c7910a0db97a91c9cd.tar.gz | |
Convert docs subdirectory to non-recursive make
| -rw-r--r-- | Makefile.am | 46 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | docs/Makefile.am | 1 | ||||
| -rw-r--r-- | docs/libyelp/version.xml.in | 2 |
4 files changed, 41 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 3d36d2ee..09146739 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS = po data docs +SUBDIRS = po data # Libtool is utterly broken when it comes to ordering library dependencies. # Hack around this awfulness: https://lists.gnu.org/archive/html/libtool/2004-10/msg00051.html @@ -248,10 +248,6 @@ yelp_LDADD = \ yelp_LDFLAGS = $(WARN_LDFLAGS) -install-exec-hook: - rm -f $(DESTDIR)$(bindir)/gnome-help && \ - $(LN_S) yelp $(DESTDIR)$(bindir)/gnome-help - YELP_COMMON_CFLAGS = \ $(YELP_CFLAGS) \ $(WARN_CFLAGS) \ @@ -311,6 +307,39 @@ tests_test_view_LDADD = \ $(YELP_COMMON_LDADD) \ libyelp/libyelp.la +gtkdoc_builddir = $(top_builddir)/docs/libyelp +gtkdoc_distdir = $(top_distdir)/docs/libyelp +gtkdoc_srcdir = $(top_srcdir)/docs/libyelp + +all-local: $(bin_PROGRAMS) + cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) all +check-local: + cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) check +clean-local: + cd $(gtkdoc_builddir) && if test -e Makefile ; then \ + $(MAKE) $(AM_MAKEFLAGS) clean ; \ + fi +distclean-local: + cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) distclean +docs: $(lib_LTLIBRARIES) + cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) docs +install-data-local: + cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) install-data +uninstall-local: + cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) uninstall + +dist-hook: + $(MKDIR_P) $(gtkdoc_distdir) + cp $(gtkdoc_srcdir)/Makefile.am $(gtkdoc_srcdir)/Makefile.in $(gtkdoc_distdir) + cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) \ + distdir="../../$(gtkdoc_distdir)" \ + top_distdir="../../$(top_distdir)" \ + dist-hook + +install-exec-hook: + rm -f $(DESTDIR)$(bindir)/gnome-help && \ + $(LN_S) yelp $(DESTDIR)$(bindir)/gnome-help + @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications @@ -401,7 +430,10 @@ dist_noinst_DATA = \ data/domains/yelp.pot \ data/domains/yelp.xml.in \ data/domains/yelp.xml \ - libyelp/yelp-marshal.list + docs/libyelp/libyelp-docs.xml \ + docs/libyelp/version.xml.in \ + libyelp/yelp-marshal.list \ + gtk-doc.make dist_noinst_SCRIPTS = \ autogen.sh @@ -415,3 +447,5 @@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-bz2 \ --enable-gtk-doc \ --enable-lzma + +.PHONY: docs diff --git a/configure.ac b/configure.ac index 711f071f..dc0bee97 100644 --- a/configure.ac +++ b/configure.ac @@ -152,7 +152,6 @@ GTK_DOC_CHECK([1.13],[--flavour no-tmpl]) AC_CONFIG_FILES([ Makefile -docs/Makefile docs/libyelp/Makefile docs/libyelp/version.xml data/Makefile diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index 99b6b71a..00000000 --- a/docs/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = libyelp diff --git a/docs/libyelp/version.xml.in b/docs/libyelp/version.xml.in index d78bda93..a24f9877 100644 --- a/docs/libyelp/version.xml.in +++ b/docs/libyelp/version.xml.in @@ -1 +1 @@ -@VERSION@ +@PACKAGE_VERSION@ |