Merge lp:~chasedouglas/xorg-gtest/fixes into lp:~oif-team/xorg-gtest/trunk

[Chase Douglas]

A few minor fixes

[Thomas Voß (thomas-voss)]

Looks good to me.

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2011-12-14 19:34:01 +0000
+++ Makefile.am	2011-12-21 16:19:09 +0000
@@ -42,7 +42,8 @@
 INSTALL:
 	$(INSTALL_CMD)
 
-doc-%:
+.PHONY: doc
+doc:
 	$(MAKE) -C doc $@
 
 dist-hook: ChangeLog INSTALL
 
=== modified file 'configure.ac'
--- configure.ac	2011-12-14 19:34:01 +0000
+++ configure.ac	2011-12-21 16:19:09 +0000
@@ -14,7 +14,7 @@
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
 
-LIB_VERSION=0:1:0
+LIB_VERSION=0:0:0
 AC_SUBST([LIB_VERSION])
 
 # Initialize libtool
 
=== modified file 'doc/Makefile.am'
--- doc/Makefile.am	2011-12-14 19:00:13 +0000
+++ doc/Makefile.am	2011-12-21 16:19:09 +0000
@@ -24,26 +24,18 @@
 EXTRA_DIST = \
 	Doxyfile 
 
-doc-html: doc-html-doxygen 
-
-doc-man: doc-man-doxygen
-
-doc-pdf: doc-pdf-doxygen
-
-doc-html-doxygen:
-	doxygen 
-
-doc-man-doxygen:
-	doxygen 
-
-doc-pdf-doxygen:
-	doxygen 
+doc:
+	doxygen
 
 install-data-local:
 	if [ -d api/html ]; then \
 		$(INSTALL) -d $(DESTDIR)$(docdir); \
 		cp -a api/html $(DESTDIR)$(docdir); \
 	fi
+	if [ -d api/man ]; then \
+		$(INSTALL) -d $(DESTDIR)$(mandir)/man3; \
+		$(INSTALL) api/man/man3/* $(DESTDIR)$(mandir)/man3; \
+	fi
 
 clean-local:
 	-rm -rf *.pdf *.html api
 
=== modified file 'examples/Makefile.am'
--- examples/Makefile.am	2011-12-14 19:34:01 +0000
+++ examples/Makefile.am	2011-12-21 16:19:09 +0000
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-noinst_PROGRAMS = xorg_gtest_example
+noinst_PROGRAMS = xorg-gtest-example
 
 xorg_gtest_example_SOURCES = xorg-gtest.cpp