Xorg-gtest

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

  1. autofix
  2. Merge into trunk
Proposed by Jussi Pakkanen
Status: Rejected
Rejected by: Chase Douglas
Proposed branch: lp://staging/~jpakkane/xorg-gtest/autofix
Merge into: lp://staging/~oif-team/xorg-gtest/trunk
Diff against target: 81 lines (+13/-32)
3 files modified
Makefile.am (+11/-1)
configure.ac (+2/-2)
examples/Makefile.am (+0/-29)
To merge this branch: bzr merge lp://staging/~jpakkane/xorg-gtest/autofix
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Needs Fixing
Thomas Voß (community) Needs Fixing
Review via email: mp+91042@code.staging.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Thomas Voß (thomas-voss) wrote :

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

review: Needs Fixing
lp://staging/~jpakkane/xorg-gtest/autofix updated
12. By Jussi Pakkanen

Remove useless line.

Revision history for this message
Stephen M. Webb (bregma) wrote :

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
Revision history for this message
Jussi Pakkanen (jpakkane) wrote :

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

Unmerged revisions

12. By Jussi Pakkanen

Remove useless line.

11. By Jussi Pakkanen

Fix autogarbage so it actually builds.

10. By Jussi Pakkanen

Fix maintainer mode setup.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches