[grilo] doc: put manpages in doc/man
- From: Juan A. Suárez Romero <jasuarez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo] doc: put manpages in doc/man
- Date: Mon, 13 Feb 2017 17:24:16 +0000 (UTC)
commit 000303d276ff2af4827ad47d90bc1e2ff33570ec
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date: Sun Dec 11 13:21:02 2016 +0100
doc: put manpages in doc/man
Put all manpage files together.
https://bugzilla.gnome.org/show_bug.cgi?id=775950
Makefile.am | 8 +-------
configure.ac | 1 +
doc/Makefile.am | 6 +++++-
doc/man/Makefile.am | 14 ++++++++++++++
.../grilo-test-ui => doc/man}/grilo-test-ui-0.3.1 | 0
grl-inspect-0.3.1 => doc/man/grl-inspect-0.3.1 | 0
grl-launch-0.3.1 => doc/man/grl-launch-0.3.1 | 0
tools/grilo-test-ui/Makefile.am | 2 --
8 files changed, 21 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9f5398e..104297d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,16 +7,12 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src libs bindings po tools examples
+SUBDIRS = src libs bindings po tools doc examples
if ENABLE_TESTS
SUBDIRS += tests
endif
-if ENABLE_GTK_DOC
-SUBDIRS += doc
-endif
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = grilo-0.3.pc
@@ -28,8 +24,6 @@ if BUILD_GRILO_PLS
pkgconfig_DATA += grilo-pls-0.3.pc
endif
-dist_man1_MANS = grl-inspect-0.3.1 grl-launch-0.3.1
-
MAINTAINERCLEANFILES = \
$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
diff --git a/configure.ac b/configure.ac
index a3242ac..8d9f963 100644
--- a/configure.ac
+++ b/configure.ac
@@ -301,6 +301,7 @@ AC_CONFIG_FILES([
bindings/vala/Makefile
doc/Makefile
doc/grilo/Makefile
+ doc/man/Makefile
examples/Makefile
])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1648c9d..3429f09 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,6 +5,10 @@
#
# Copyright (C) 2011 Igalia S.L. All rights reserved.
-SUBDIRS = grilo
+SUBDIRS = man
+
+if ENABLE_GTK_DOC
+SUBDIRS += grilo
+endif
-include $(top_srcdir)/git.mk
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
new file mode 100644
index 0000000..bf467e5
--- /dev/null
+++ b/doc/man/Makefile.am
@@ -0,0 +1,14 @@
+#
+# Makefile.am
+#
+# Author: Juan A. Suarez Romero <jasuarez igalia com>
+#
+# Copyright (C) 2016 Igalia S.L. All rights reserved.
+
+dist_man1_MANS = grl-inspect-0.3.1 grl-launch-0.3.1
+
+if BUILD_GRILO_TEST_UI
+dist_man1_MANS += grilo-test-ui-0.3.1
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/tools/grilo-test-ui/grilo-test-ui-0.3.1 b/doc/man/grilo-test-ui-0.3.1
similarity index 100%
rename from tools/grilo-test-ui/grilo-test-ui-0.3.1
rename to doc/man/grilo-test-ui-0.3.1
diff --git a/grl-inspect-0.3.1 b/doc/man/grl-inspect-0.3.1
similarity index 100%
rename from grl-inspect-0.3.1
rename to doc/man/grl-inspect-0.3.1
diff --git a/grl-launch-0.3.1 b/doc/man/grl-launch-0.3.1
similarity index 100%
rename from grl-launch-0.3.1
rename to doc/man/grl-launch-0.3.1
diff --git a/tools/grilo-test-ui/Makefile.am b/tools/grilo-test-ui/Makefile.am
index a979642..a849af6 100644
--- a/tools/grilo-test-ui/Makefile.am
+++ b/tools/grilo-test-ui/Makefile.am
@@ -7,8 +7,6 @@
bin_PROGRAMS = grilo-test-ui-@GRL_MAJORMINOR@
-dist_man1_MANS = grilo-test-ui-0.3.1
-
grilo_test_ui_@GRL_MAJORMINOR@_SOURCES = \
main.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]