summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am4
-rw-r--r--common/Makefile.am6
-rw-r--r--common/collection/README2
-rw-r--r--contrib/sssd.spec.in6
4 files changed, 14 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index cfdce61c..3a1fb5be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,4 +58,6 @@ tests: all
done
docs:
- $(MAKE) -C src $@
+ for subdir in $(SUBDIRS); do \
+ $(MAKE) -C $$subdir $@; \
+ done
diff --git a/common/Makefile.am b/common/Makefile.am
index cbd2866c..331f75d8 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,5 +1,6 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = trace collection ini dhash path_utils refarray
+DOCDIRS = collection
dist_noinst_DATA = \
m4
@@ -25,3 +26,8 @@ tests: all
for subdir in $(SUBDIRS); do \
$(MAKE) -C $$subdir $@; \
done
+
+docs:
+ for subdir in $(DOCDIRS); do \
+ $(MAKE) -C $$subdir $@; \
+ done
diff --git a/common/collection/README b/common/collection/README
deleted file mode 100644
index 83a7b923..00000000
--- a/common/collection/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Documentation for libcollection can be found in collection.h and
-collection_tools.h
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 3acecd3c..324131a0 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -205,6 +205,10 @@ KRB5_LIBS=-lkrb5 \
make %{?_smp_mflags}
+pushd common/collection
+make %{?_smp_mflags} docs
+popd
+
%check
make %{?_smp_mflags} check
@@ -360,7 +364,7 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/collection_stack.h
%{_libdir}/libcollection.so
%{_libdir}/pkgconfig/collection.pc
-%doc common/collection/README
+%doc common/collection/doc/html/
%files -n libini_config
%defattr(-,root,root,-)