Merge branch 'master' of https://github.com/ClusterLabs/libqb into gh…

…-pages

.travis.yml

@@ -5,11 +5,14 @@ addons:
                 packages:
                   - check
                   - splint
-script: ./autogen.sh
-        && ./configure --enable-syslog-tests
-        && make
-        && make check
-        && make distcheck
+                  # for "make rpm"
+                  - doxygen
+                  - rpm
+script: RPMBUILDOPTS_="--nodeps --define '_without_check 1'";
+        ./autogen.sh
+        && ./configure
+        && DISTCHECK_CONFIGURE_FLAGS=--enable-syslog-tests make distcheck
+        && sed "s|RPMBUILDOPTS =|\\0 ${RPMBUILDOPTS_}|" Makefile | make -f- rpm
 sudo: false
 
 notifications:

Makefile.am

@@ -21,8 +21,6 @@
 
 SPEC			= $(PACKAGE_NAME).spec
 
-TARFILE			= $(PACKAGE_NAME)-$(VERSION).tar.gz
-
 EXTRA_DIST		= autogen.sh $(SPEC).in \
 			  build-aux/git-version-gen \
 			  build-aux/gitlog-to-changelog \
@@ -47,20 +45,20 @@ doxygen:
 	$(MAKE) -C docs doxygen
 
 dist-clean-local:
-	$(AM_V_GEN)rm -f autoconf automake autoheader
+	rm -f autoconf automake autoheader
 
 maintainer-clean-local:
-	$(AM_V_GEN)rm -rf m4
-	$(AM_V_GEN)rm -f .version .tarball-version
+	rm -rf m4
+	rm -f .version .tarball-version
 
-clean-generic:
-	$(AM_V_GEN)rm -rf $(SPEC) $(TARFILE)
+clean-local:
+	rm -rf $(SPEC) $(DIST_ARCHIVES)
 
 ## make rpm/srpm section.
 
 $(SPEC): $(SPEC).in
-	$(AM_V_GEN)rm -f $@-t $@
-	date="$(shell LC_ALL=C date "+%a %b %d %Y")" && \
+	@rm -f $@-t $@
+	@date="$(shell LC_ALL=C date "+%a %b %d %Y")" && \
 	if [ -f .tarball-version ]; then \
 		gitver="$(shell cat .tarball-version)" && \
 		rpmver=$$gitver && \
@@ -95,28 +93,26 @@ $(SPEC): $(SPEC).in
 		$< > $@-t; \
 	fi; \
 	if [ -z "$$dirty" ]; then sed -i -e "s#%glo.*dirty.*##g" $@-t; fi
-	$(AM_V_GEN)chmod a-w $@-t
+	@chmod a-w $@-t
 	$(AM_V_GEN)mv $@-t $@
 
-$(TARFILE):
-	$(MAKE) dist
-
 RPMBUILDOPTS	= --define "_sourcedir $(abs_builddir)" \
 		  --define "_specdir $(abs_builddir)" \
 		  --define "_builddir $(abs_builddir)" \
 		  --define "_srcrpmdir $(abs_builddir)" \
 		  --define "_rpmdir $(abs_builddir)"
 
-tarball: $(TARFILE)
+# generates both .tar.[gx]z (backward compatibility)
+tarball: dist
 
 srpm: clean
 	autoreconf -if
-	$(MAKE) $(SPEC) tarball
+	$(MAKE) $(SPEC) dist-xz
 	rpmbuild $(RPMBUILDOPTS) --nodeps -bs $(SPEC)
 
 rpm: clean
 	autoreconf -if
-	$(MAKE) $(SPEC) tarball
+	$(MAKE) $(SPEC) dist-xz
 	rpmbuild $(RPMBUILDOPTS) -ba $(SPEC)
 
 # release/versioning

README.markdown

@@ -14,7 +14,7 @@ applications.
 ## For more information, see:
 * [libqb wiki](https://github.com/clusterlabs/libqb/wiki)
 * [Issues/Bugs](https://github.com/clusterlabs/libqb/issues)
-* [The doxygen generated manual](http://clusterlabs.github.io/libqb/0.16.0/doxygen/)
+* [The doxygen generated manual](http://clusterlabs.github.io/libqb/CURRENT/doxygen/)
 * You can build it yourself with the following commands:
 
     $ make doxygen

build-aux/generate-docs

@@ -25,7 +25,8 @@ make_version_dir() {
 	[ ! -e "$NV" ] || die "gh-pages branch already has $NV"
 
 	# Create the online documentation directory for the new version.
-	mkdir "$NV/"
+	mkdir "$NV"
+	ln -fs "$NV" CURRENT
 }
 
 build_doxygen() {
@@ -76,7 +77,7 @@ build_changelog
 echo
 echo "Adding online documentation to gh-pages branch ..."
 git checkout gh-pages
-git add "$NV"
+git add "$NV" CURRENT
 git commit -m "Add online documentation for v$NV"
 
 echo

configure.ac

@@ -409,9 +409,10 @@ if test x"$memory_barrier_needed" != xno; then
 			   [need atomic memory barrier])
 fi
 
-LINT_FLAGS="-syntax -weak -unrecog +posixlib +ignoresigns -fcnuse \
-	-badflag -D__gnuc_va_list=va_list -D__attribute\(x\)= \
-	-warnposix +matchanyintegral -sysunrecog"
+LINT_FLAGS="-weak -D__gnuc_va_list=va_list -D__attribute\(x\)= \
+	-badflag -fcnuse -syntax -unrecog -sysunrecog -warnposix \
+	+ignoresigns +matchanyintegral +posixlib \
+	+showscan +showsummary"
 
 # local options
 AC_ARG_ENABLE([ansi],
@@ -619,8 +620,9 @@ AC_CONFIG_FILES([Makefile
 		 tests/test.conf
 		 examples/Makefile
 		 docs/Makefile
-		 docs/man.dox
-		 docs/html.dox])
+		 docs/common.dox
+		 docs/html.dox
+		 docs/man.dox])
 
 AC_OUTPUT
 

docs/Makefile.am

@@ -18,24 +18,22 @@
 # along with libqb.  If not, see <http://www.gnu.org/licenses/>.
 
 MAINTAINERCLEANFILES	= Makefile.in
-EXTRA_DIST 		= man.dox html.dox
+EXTRA_DIST 		= common.dox html.dox man.dox
 noinst_HEADERS          = mainpage.h
 
 dist_man_MANS = man8/qb-blackbox.8
 if HAVE_DOXYGEN
 inc_dir = $(top_srcdir)/include/qb
-
-dependent_headers = $(subst $(inc_dir),,$(shell \
+public_headers = $(sort $(patsubst %.in,%,$(subst $(inc_dir)/,,$(shell \
 	printf 'include $(inc_dir)/Makefile.am\n\n%%.var:\n\t@echo $$($$*)' \
-	| ${MAKE} --no-print-directory -f - inst_HEADERS.var \
-	|| echo $(inc_dir)/qb*.h))
-dependent_headers_omit = qbconfig.h
+	| ${MAKE} --no-print-directory -f- inst_HEADERS.var \
+	|| echo $(inc_dir)/qb*.h*))))
+public_headers_omit = qbconfig.h
+public_headers_pick = $(filter-out $(public_headers_omit),$(public_headers) )
 
-dist_man3_MANS = $(patsubst %,man3/%.3,$(filter-out \
-		     $(dependent_headers_omit),$(dependent_headers) \
-		 ))
+dist_man3_MANS = $(patsubst %,man3/%.3,$(public_headers_pick))
 
-$(dist_man3_MANS): man.dox $(dependent_headers:%=$(inc_dir)/%)
+$(dist_man3_MANS): man.dox $(public_headers_pick:%=$(inc_dir)/%)
 	mkdir -p man3
 	doxygen man.dox
 
@@ -48,5 +46,5 @@ doxygen:
 	@echo WARNING: no doxygen to build man pages!
 endif
 
-clean-generic:
+clean-local:
 	rm -rf html man3