Merge lp:~jpakkane/xorg-gtest/autofix into lp:~oif-team/xorg-gtest/trunk

[Jussi Pakkanen]

The current autotools setup does not work. It builds successfully only if you already have the library built and installed on your system. Fix the build system to do the right thing.

[Thomas Voß (thomas-voss)]

Get rid of the commented out xorg_gtest_example_LDADD in Makefile.am. Apart from that, looks good to me.

review: Needs Fixing

[lp:~jpakkane/xorg-gtest/autofix]

12. By Jussi Pakkanen on 2012-02-01

Remove useless line.

[Stephen M. Webb (bregma)]

The line

  xorg_gtest_example_LDFLAGS = libxorg-gtest.la libxorg-gtest_main.la -lgtest -lpthread -lX11

is wrong. It should be using the symbols for libraries found in the configuration run, like this.

  xorg_gtest_example_LDFLAGS = libxorg-gtest.la libxorg-gtest_main.la $(GTEST_LDFLAGS) $(XSERVER_LIBS)

except, of course, GTEST_LDFLAGS is not set in configure.ac, only GTEST_CPPFLAGS is, so that particular library can wait for another patch later. I'd like to point out that on my machine, $(XSERVER_LIBS) does not yield the same string as '-lX11'.

review: Needs Fixing

[Jussi Pakkanen (jpakkane)]

This project has moved to freedesktop, so this merge request is obsolete.

Unmerged revisions

12. By Jussi Pakkanen on 2012-02-01

Remove useless line.

11. By Jussi Pakkanen on 2012-02-01

Fix autogarbage so it actually builds.

10. By Jussi Pakkanen on 2012-02-01

Fix maintainer mode setup.

=== modified file 'Makefile.am'
--- Makefile.am	2011-12-21 16:09:22 +0000
+++ Makefile.am	2012-02-01 11:59:18 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = doc examples
+SUBDIRS = doc
 
 lib_LTLIBRARIES = libxorg-gtest.la libxorg-gtest_main.la
 
@@ -38,6 +38,16 @@
 
 AM_CXXFLAGS = -Iinclude
 
+noinst_PROGRAMS = xorg-gtest-example
+
+xorg_gtest_example_SOURCES = examples/xorg-gtest.cpp
+
+xorg_gtest_example_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	$(GTEST_CPPFLAGS)
+
+xorg_gtest_example_LDFLAGS = libxorg-gtest.la libxorg-gtest_main.la -lgtest -lpthread -lX11
+
 .PHONY: ChangeLog INSTALL
 INSTALL:
 	$(INSTALL_CMD)

=== modified file 'configure.ac'
--- configure.ac	2011-12-21 15:49:58 +0000
+++ configure.ac	2012-02-01 11:59:18 +0000
@@ -12,7 +12,7 @@
 # Initialize Automake
 AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2])
 AM_SILENT_RULES([yes])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
 
 LIB_VERSION=0:0:0
 AC_SUBST([LIB_VERSION])
@@ -43,6 +43,6 @@
                 
 AC_SUBST(AM_CPPFLAGS, "-Wall -Werror")
 
-AC_CONFIG_FILES([doc/Makefile examples/Makefile])
+AC_CONFIG_FILES([doc/Makefile])
 
 AC_OUTPUT

=== removed file 'examples/Makefile.am'
--- examples/Makefile.am	2011-12-21 15:51:51 +0000
+++ examples/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-#
-# @file examples/Makefile.am 
-# @brief automake recipe for the xorg-gtest examples
-#
-# Copyright 2011 Canonical, Ltd.
-#
-# This file is part of the utouch-geis library. This library is free software;
-# you can redistribute it and/or modify it under the terms of the GNU Lesser
-# General Public License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-noinst_PROGRAMS = xorg-gtest-example
-
-xorg_gtest_example_SOURCES = xorg-gtest.cpp
-
-xorg_gtest_example_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(GTEST_CPPFLAGS)
-
-xorg_gtest_example_LDFLAGS = -lxorg-gtest -lxorg-gtest_main -lgtest -lpthread -lX11