Merge lp:~bregma/nux/fix-make-distcheck-failures into lp:nux

[Stephen M. Webb]

fix failures in 'make distcheck' (lp: #1170358)

= Problem description =

"make distcheck" fails

= The fix =

Proper project hygiene has not been followed and the various makefiles have bitrotted. I had to add new files to distribution lists and new clean targets where appropriate.

= Test coverage =

Running 'make distcheck' should complete successfully.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:777
http://jenkins.qa.ubuntu.com/job/nux-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-raring-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-raring-armhf-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-raring-i386-ci/24

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/24/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

make distcheck now passes with this merge.

review: Approve

=== modified file 'Nux/Makefile.am'
--- Nux/Makefile.am	2012-12-04 19:36:00 +0000
+++ Nux/Makefile.am	2013-04-18 13:55:29 +0000
@@ -174,6 +174,7 @@
   $(srcdir)/LayeredLayout.h \
   $(srcdir)/Layout.h \
   $(srcdir)/LinearLayout.h \
+  $(srcdir)/MainLoopGLib.h \
   $(srcdir)/Nux.h \
   $(srcdir)/NuxGlobalInitializer.h \
   $(srcdir)/Painter.h \

=== modified file 'NuxCore/Makefile.am'
--- NuxCore/Makefile.am	2012-12-04 19:36:00 +0000
+++ NuxCore/Makefile.am	2013-04-18 13:55:29 +0000
@@ -134,6 +134,7 @@
   $(srcdir)/Color.h \
   $(srcdir)/Colors.h \
   $(srcdir)/Logger.h \
+  $(srcdir)/LoggerPrivate.h \
   $(srcdir)/LoggingWriter.h \
   $(srcdir)/RollingFileAppender.h \
   $(srcdir)/Memory.h \

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-03-16 15:33:33 +0000
+++ data/Makefile.am	2013-04-18 13:55:29 +0000
@@ -1,5 +1,5 @@
 # Please keep these in alphabetical order
-PKGDATADIR="$(pkgdatadir)/@NUX_API_VERSION@"
+PKGDATADIR=$(pkgdatadir)/@NUX_API_VERSION@
 
 fontdir = $(PKGDATADIR)/Fonts
 dist_font_DATA = \

=== modified file 'examples/Makefile.am'
--- examples/Makefile.am	2012-11-27 21:40:42 +0000
+++ examples/Makefile.am	2013-04-18 13:55:29 +0000
@@ -114,7 +114,7 @@
 coverflow_SOURCES = coverflow.cpp
 coverflow_LDADD = $(ALL_LIBS)
 
-kinetic_scroll_view_SOURCES = kinetic_scroll_view.cpp TestButton.cpp
+kinetic_scroll_view_SOURCES = kinetic_scroll_view.cpp TestButton.h TestButton.cpp
 kinetic_scroll_view_LDADD = $(ALL_LIBS)
 
 if HAVE_GEIS

=== modified file 'gputests/Makefile.am'
--- gputests/Makefile.am	2012-05-25 20:36:09 +0000
+++ gputests/Makefile.am	2013-04-18 13:55:29 +0000
@@ -53,7 +53,7 @@
 arb_programs_limits_LDADD = $(ALL_LIBS)
 
 # distribute source along to the documentation
-sourcegputestsdir = "$(pkgdatadir)/gputests"
+sourcegputestsdir = $(pkgdatadir)/gputests
 sourcegputests_DATA = $(texture_power_of_2_SOURCES) \
                       $(framebufferobject_SOURCES) \
                       $(quad_2texmod) \
@@ -61,6 +61,5 @@
                       $(texture_blur_SOURCES) \
                       $(texture_data_SOURCES) \
                       $(arb_programs_limits_SOURCES)
-
 endif
 

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2013-03-12 14:05:14 +0000
+++ tests/Makefile.am	2013-04-18 13:55:29 +0000
@@ -395,8 +395,9 @@
 	      | sed 's/>GTester Unit Test Report</>GTester Unit Test Report (normal)</' \
 	      > test-nux-results.html )
 
-clean-generic:
-	rm -f test-nux-results.xml test-nux-results.html
+CLEANFILES = \
+	test-nux-results.xml test-nux-results.html \
+	gtest-nux-results.xml
 
 .PHONY: check check-report full-report gtest test check-headless