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
=== modified file 'Nux/Makefile.am'
--- Nux/Makefile.am 2011-12-05 16:14:44 +0000
+++ Nux/Makefile.am 2011-12-06 17:04:26 +0000
@@ -105,7 +105,7 @@
105 $(srcdir)/WindowThread.cpp105 $(srcdir)/WindowThread.cpp
106106
107source_h = \107source_h = \
108 $(srcdir)/ABI.h \108 $(builddir)/ABI.h \
109 $(srcdir)/AbstractButton.h \109 $(srcdir)/AbstractButton.h \
110 $(srcdir)/AbstractCheckedButton.h \110 $(srcdir)/AbstractCheckedButton.h \
111 $(srcdir)/AbstractComboBox.h \111 $(srcdir)/AbstractComboBox.h \
112112
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am 2011-11-28 03:13:44 +0000
+++ tests/Makefile.am 2011-12-06 17:04:26 +0000
@@ -104,18 +104,36 @@
104test_empty_window_LDADD = $(TestLibs)104test_empty_window_LDADD = $(TestLibs)
105test_empty_window_LDFLAGS = -lpthread105test_empty_window_LDFLAGS = -lpthread
106106
107button_xtest_SOURCES = button-xtest.cpp nux_test_framework.cpp nux_automated_test_framework.cpp107button_xtest_SOURCES = button-xtest.cpp \
108 nux_test_framework.cpp \
109 nux_test_framework.h \
110 nux_automated_test_framework.cpp \
111 nux_automated_test_framework.h
108112
109button_xtest_CPPFLAGS = $(TestFlags)113button_xtest_CPPFLAGS = $(TestFlags)
110button_xtest_LDADD = $(TestLibs)114button_xtest_LDADD = $(TestLibs)
111button_xtest_LDFLAGS = -lpthread -lXtst115button_xtest_LDFLAGS = -lpthread -lXtst
112116
113mouse_events_test_SOURCES = mouse-events-test.cpp test-view.cpp nux_test_framework.cpp nux_automated_test_framework.cpp117mouse_events_test_SOURCES = mouse-events-test.cpp \
118 nux_test_framework.cpp \
119 nux_test_framework.h \
120 nux_automated_test_framework.cpp \
121 nux_automated_test_framework.h \
122 test-view.cpp \
123 test-view.h
124
114mouse_events_test_CPPFLAGS = $(TestFlags)125mouse_events_test_CPPFLAGS = $(TestFlags)
115mouse_events_test_LDADD = $(TestLibs)126mouse_events_test_LDADD = $(TestLibs)
116mouse_events_test_LDFLAGS = -lpthread -lXtst127mouse_events_test_LDFLAGS = -lpthread -lXtst
117128
118mouse_buttons_test_SOURCES = mouse-buttons-test.cpp test-view.cpp nux_test_framework.cpp nux_automated_test_framework.cpp129mouse_buttons_test_SOURCES = mouse-buttons-test.cpp \
130 nux_test_framework.cpp \
131 nux_test_framework.h \
132 nux_automated_test_framework.cpp \
133 nux_automated_test_framework.h \
134 test-view.cpp \
135 test-view.h
136
119mouse_buttons_test_CPPFLAGS = $(TestFlags)137mouse_buttons_test_CPPFLAGS = $(TestFlags)
120mouse_buttons_test_LDADD = $(TestLibs)138mouse_buttons_test_LDADD = $(TestLibs)
121mouse_buttons_test_LDFLAGS = -lpthread -lXtst139mouse_buttons_test_LDFLAGS = -lpthread -lXtst

Subscribers

People subscribed via source and target branches

to all changes: