summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiří Techet <techet@gmail.com>2010-05-23 15:35:58 +0200
committerJiří Techet <techet@gmail.com>2010-05-23 15:35:58 +0200
commit1079c54d7daac7b24ea6e38b56eb59efaea645fe (patch)
tree9c8b87c604270910c8649c42954c7eac80deeb1a
parent08aa6da124aa198b0e15779fd3878a73fbdb4944 (diff)
downloadlibchamplain-1079c54d7daac7b24ea6e38b56eb59efaea645fe.tar.gz
Add Makefile.am under /docs
Signed-off-by: Jiří Techet <techet@gmail.com>
-rw-r--r--Makefile.am8
-rw-r--r--configure.ac1
-rw-r--r--docs/Makefile.am6
3 files changed, 11 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index d0375a1..194bca9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = tidy champlain docs/reference
+SUBDIRS = tidy champlain
ACLOCAL_AMFLAGS = -I m4
@@ -10,7 +10,7 @@ champlain-@API_VERSION@-uninstalled.pc: champlain-uninstalled.pc
@cp -f $< $@
if ENABLE_GTK
-SUBDIRS += champlain-gtk docs/reference-gtk
+SUBDIRS += champlain-gtk
pcfiles += champlain-gtk-@API_VERSION@.pc
champlain-gtk-@API_VERSION@.pc: champlain-gtk.pc
@cp -f $< $@
@@ -22,13 +22,13 @@ endif
pkgconfig_DATA = $(pcfiles)
pkgconfigdir = $(libdir)/pkgconfig
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-python
+DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-python --enable-vala --enable-introspection --enable-gtk
CLEANFILES = $(pcfiles) $(other_pcfiles)
all: $(other_pcfiles)
# Have the demos build at the end as they depend on optional parts
-SUBDIRS += demos bindings
+SUBDIRS += docs demos bindings
ChangeLog: Makefile.am
git log --pretty=short > ChangeLog
diff --git a/configure.ac b/configure.ac
index c03b987..84521d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,6 +245,7 @@ AC_CONFIG_FILES([Makefile
champlain/champlain-version.h
demos/Makefile
tidy/Makefile
+ docs/Makefile
docs/reference/Makefile
docs/reference/version.xml
champlain.pc
diff --git a/docs/Makefile.am b/docs/Makefile.am
new file mode 100644
index 0000000..2a2a881
--- /dev/null
+++ b/docs/Makefile.am
@@ -0,0 +1,6 @@
+SUBDIRS=reference
+
+if ENABLE_GTK
+ SUBDIRS+=reference-gtk
+endif
+