summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/Makefile.am5
-rw-r--r--mono/doc/Makefile.am5
-rw-r--r--qt/Makefile.am2
3 files changed, 8 insertions, 4 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 337fb4f0..7df331c5 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,6 @@
EXTRA_DIST= \
- dbus-specification.html \
dbus-specification.xml \
- dbus-test-plan.html \
dbus-test-plan.xml \
- dbus-tutorial.html \
dbus-tutorial.xml \
dcop-howto.txt \
file-boilerplate.c
@@ -16,6 +13,8 @@ HTML_FILES= \
if DBUS_XML_DOCS_ENABLED
all-local: $(HTML_FILES)
+EXTRA_DIST += $(HTML_FILES)
+
dbus-specification.html: dbus-specification.xml
$(XMLTO) html-nochunks $<
diff --git a/mono/doc/Makefile.am b/mono/doc/Makefile.am
index 8be3cfd5..ea7a3dc6 100644
--- a/mono/doc/Makefile.am
+++ b/mono/doc/Makefile.am
@@ -24,7 +24,10 @@ update:
CLEANFILES = dbus-sharp-docs.zip dbus-sharp-docs.tree
-EXTRA_DIST = dbus-sharp-docs.source dbus-sharp-docs.tree dbus-sharp-docs.zip
+EXTRA_DIST = dbus-sharp-docs.source
+if ENABLE_MONODOC
+EXTRA_DIST += dbus-sharp-docs.tree dbus-sharp-docs.zip
+endif
dist-hook:
mkdir -p $(distdir)/en
diff --git a/qt/Makefile.am b/qt/Makefile.am
index e6f7a08b..fd273500 100644
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -1,3 +1,4 @@
+if HAVE_QT
INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_QT_CXXFLAGS)
dbusincludedir=$(includedir)/dbus-1.0/dbus
@@ -23,3 +24,4 @@ libdbus_qt_1_la_LDFLAGS= -version-info 1:0
%.moc: %.h
$(QT_MOC) $< > $@
+endif