Nux

Merge lp:~unity-team/nux/nux-fix-abi-version-file into lp:nux/2.0

  1. nux-fix-abi-version-file
  2. Merge into 2.0
Proposed by Jay Taoko
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 527
Merged at revision: 527
Proposed branch: lp:~unity-team/nux/nux-fix-abi-version-file
Merge into: lp:nux/2.0
Diff against target: 56 lines (+22/-4)
2 files modified
Nux/Makefile.am (+1/-1)
tests/Makefile.am (+21/-3)
To merge this branch: bzr merge lp:~unity-team/nux/nux-fix-abi-version-file
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+84638@code.launchpad.net

Description of the change

* Fix: look for ABI.h in $(builddir) rather than $(srcdir) in case the builddir is different from the srcdir.
* Fix: "make distcheck" was failing

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Looks good! Approving. Thanks Jay :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Nux/Makefile.am'
2--- Nux/Makefile.am 2011-12-05 16:14:44 +0000
3+++ Nux/Makefile.am 2011-12-06 17:04:26 +0000
4@@ -105,7 +105,7 @@
5 $(srcdir)/WindowThread.cpp
6
7 source_h = \
8- $(srcdir)/ABI.h \
9+ $(builddir)/ABI.h \
10 $(srcdir)/AbstractButton.h \
11 $(srcdir)/AbstractCheckedButton.h \
12 $(srcdir)/AbstractComboBox.h \
13
14=== modified file 'tests/Makefile.am'
15--- tests/Makefile.am 2011-11-28 03:13:44 +0000
16+++ tests/Makefile.am 2011-12-06 17:04:26 +0000
17@@ -104,18 +104,36 @@
18 test_empty_window_LDADD = $(TestLibs)
19 test_empty_window_LDFLAGS = -lpthread
20
21-button_xtest_SOURCES = button-xtest.cpp nux_test_framework.cpp nux_automated_test_framework.cpp
22+button_xtest_SOURCES = button-xtest.cpp \
23+ nux_test_framework.cpp \
24+ nux_test_framework.h \
25+ nux_automated_test_framework.cpp \
26+ nux_automated_test_framework.h
27
28 button_xtest_CPPFLAGS = $(TestFlags)
29 button_xtest_LDADD = $(TestLibs)
30 button_xtest_LDFLAGS = -lpthread -lXtst
31
32-mouse_events_test_SOURCES = mouse-events-test.cpp test-view.cpp nux_test_framework.cpp nux_automated_test_framework.cpp
33+mouse_events_test_SOURCES = mouse-events-test.cpp \
34+ nux_test_framework.cpp \
35+ nux_test_framework.h \
36+ nux_automated_test_framework.cpp \
37+ nux_automated_test_framework.h \
38+ test-view.cpp \
39+ test-view.h
40+
41 mouse_events_test_CPPFLAGS = $(TestFlags)
42 mouse_events_test_LDADD = $(TestLibs)
43 mouse_events_test_LDFLAGS = -lpthread -lXtst
44
45-mouse_buttons_test_SOURCES = mouse-buttons-test.cpp test-view.cpp nux_test_framework.cpp nux_automated_test_framework.cpp
46+mouse_buttons_test_SOURCES = mouse-buttons-test.cpp \
47+ nux_test_framework.cpp \
48+ nux_test_framework.h \
49+ nux_automated_test_framework.cpp \
50+ nux_automated_test_framework.h \
51+ test-view.cpp \
52+ test-view.h
53+
54 mouse_buttons_test_CPPFLAGS = $(TestFlags)
55 mouse_buttons_test_LDADD = $(TestLibs)
56 mouse_buttons_test_LDFLAGS = -lpthread -lXtst

Subscribers

People subscribed via source and target branches

to all changes: