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

Proposed by Chase Douglas on 2011-12-21
Status: Merged
Merged at revision: 9
Proposed branch: lp:~chasedouglas/xorg-gtest/fixes
Merge into: lp:~oif-team/xorg-gtest/trunk
Diff against target: 75 lines (+10/-17)
4 files modified
Makefile.am (+2/-1)
configure.ac (+1/-1)
doc/Makefile.am (+6/-14)
examples/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~chasedouglas/xorg-gtest/fixes
Reviewer Review Type Date Requested Status
Thomas Voß (community) 2011-12-21 Approve on 2011-12-21
Review via email: mp+86581@code.launchpad.net

Description of the change

A few minor fixes

To post a comment you must log in.
Thomas Voß (thomas-voss) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2011-12-14 19:34:01 +0000
3+++ Makefile.am 2011-12-21 16:19:09 +0000
4@@ -42,7 +42,8 @@
5 INSTALL:
6 $(INSTALL_CMD)
7
8-doc-%:
9+.PHONY: doc
10+doc:
11 $(MAKE) -C doc $@
12
13 dist-hook: ChangeLog INSTALL
14
15=== modified file 'configure.ac'
16--- configure.ac 2011-12-14 19:34:01 +0000
17+++ configure.ac 2011-12-21 16:19:09 +0000
18@@ -14,7 +14,7 @@
19 AM_SILENT_RULES([yes])
20 AM_MAINTAINER_MODE
21
22-LIB_VERSION=0:1:0
23+LIB_VERSION=0:0:0
24 AC_SUBST([LIB_VERSION])
25
26 # Initialize libtool
27
28=== modified file 'doc/Makefile.am'
29--- doc/Makefile.am 2011-12-14 19:00:13 +0000
30+++ doc/Makefile.am 2011-12-21 16:19:09 +0000
31@@ -24,26 +24,18 @@
32 EXTRA_DIST = \
33 Doxyfile
34
35-doc-html: doc-html-doxygen
36-
37-doc-man: doc-man-doxygen
38-
39-doc-pdf: doc-pdf-doxygen
40-
41-doc-html-doxygen:
42- doxygen
43-
44-doc-man-doxygen:
45- doxygen
46-
47-doc-pdf-doxygen:
48- doxygen
49+doc:
50+ doxygen
51
52 install-data-local:
53 if [ -d api/html ]; then \
54 $(INSTALL) -d $(DESTDIR)$(docdir); \
55 cp -a api/html $(DESTDIR)$(docdir); \
56 fi
57+ if [ -d api/man ]; then \
58+ $(INSTALL) -d $(DESTDIR)$(mandir)/man3; \
59+ $(INSTALL) api/man/man3/* $(DESTDIR)$(mandir)/man3; \
60+ fi
61
62 clean-local:
63 -rm -rf *.pdf *.html api
64
65=== modified file 'examples/Makefile.am'
66--- examples/Makefile.am 2011-12-14 19:34:01 +0000
67+++ examples/Makefile.am 2011-12-21 16:19:09 +0000
68@@ -18,7 +18,7 @@
69 # along with this program. If not, see <http://www.gnu.org/licenses/>.
70 #
71
72-noinst_PROGRAMS = xorg_gtest_example
73+noinst_PROGRAMS = xorg-gtest-example
74
75 xorg_gtest_example_SOURCES = xorg-gtest.cpp
76

Subscribers

People subscribed via source and target branches