diff options
| author | Chase Douglas <chase.douglas@ubuntu.com> | 2011-12-21 08:30:43 -0800 |
|---|---|---|
| committer | Chase Douglas <chase.douglas@ubuntu.com> | 2011-12-21 08:30:43 -0800 |
| commit | 656d8b22be42b23d5336a85173d7381bf115a327 (patch) | |
| tree | 8c7e99e82339eb42ec7a5ff54a4c96019b02c020 | |
| parent | 37906b3c6431e470a07bbf5fd26784f5116b141c (diff) | |
| parent | e5f21a67393a5db4d91f07f87a649ec38d27fcc7 (diff) | |
Merge some miscellaneous fixes
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/Makefile.am | 20 | ||||
| -rw-r--r-- | examples/Makefile.am | 2 |
4 files changed, 10 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index b79c16c..d10bca8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,7 +42,8 @@ AM_CXXFLAGS = -Iinclude INSTALL: $(INSTALL_CMD) -doc-%: +.PHONY: doc +doc: $(MAKE) -C doc $@ dist-hook: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 9e58dc4..9d7b36b 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2]) AM_SILENT_RULES([yes]) AM_MAINTAINER_MODE -LIB_VERSION=0:1:0 +LIB_VERSION=0:0:0 AC_SUBST([LIB_VERSION]) # Initialize libtool diff --git a/doc/Makefile.am b/doc/Makefile.am index 4e809e1..f4f5fc0 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -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 diff --git a/examples/Makefile.am b/examples/Makefile.am index 3f6a8cc..0bc8272 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -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 |