← Back to branch summary

~3v1n0/frame/gcc5-rebuild

« back to all changes in this revision

Viewing changes to test/regular/Makefile.am

  • Committer: Daniel d'Andrada
  • Date: 2012-11-27 12:48:29 UTC
  • mfrom: (102.1.5 lp1080819)
  • Revision ID: daniel.dandrada@canonical.com-20121127124829-3fav4qcvcdqgffoj
https://launchpad.net/bugs/1080819
Building the X11 backend is now optional

Frame must still be available and useful in platforms that doesn't have X11.
In such cases frame_backend.h is used.

configure script output has also been embellished

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/regular/Makefile.am
1
 
test_targets = check-c-compile check-cxx-compile
 
1
test_targets =
 
2
 
 
3
if HAVE_XINPUT
 
4
test_targets += check-c-compile check-cxx-compile
 
5
endif
2
6
 
3
7
if HAVE_GTEST
4
8
test_targets += check-regular
37
41
### check-regular
38
42
 
39
43
check_regular_SOURCES = \
 
44
        backend.cpp
 
45
 
 
46
if HAVE_XINPUT
 
47
check_regular_SOURCES += \
40
48
        accept-ended-touch.cpp \
41
 
        backend.cpp \
42
 
        frame-fixture.cpp \
43
 
        frame-fixture.h
 
49
        frame-x11-fixture.cpp \
 
50
        frame-x11-fixture.h
 
51
endif
44
52
 
45
53
#
46
54
# Link against the (non-distributed) static lib to pick up the
50
58
        $(top_builddir)/src/.libs/libframe.a \
51
59
        $(top_builddir)/test/gtest/libgtest.a \
52
60
        $(top_builddir)/test/gtest/libgtest_main.a \
53
 
        $(top_builddir)/test/x11_mocks/libx11_mocks.a \
54
61
        $(COVERAGE_LIBS) \
55
62
        $(GTEST_LIBS)
56
63
 
 
64
if HAVE_XINPUT
 
65
check_regular_LDADD += \
 
66
        $(top_builddir)/test/x11_mocks/libx11_mocks.a
 
67
endif
 
68
 
57
69
check_regular_CPPFLAGS = \
58
70
        --std=c++0x \
59
71
        -I$(top_srcdir)/test/x11_mocks \