Merge lp:~jpakkane/notify-osd/builddir into lp:notify-osd

[Jussi Pakkanen]

Make it build in a separate build directory.

Make it build in a separate build directory. Tests will not pass because TEMPORARY_ICON_PREFIX_WORKAROUND borkage.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:462
http://jenkins.qa.ubuntu.com/job/notify-osd-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-ci/./build=pbuilder,distribution=raring,flavor=amd64/11/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-ci/./build=pbuilder,distribution=raring,flavor=armhf/11/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-ci/./build=pbuilder,distribution=raring,flavor=i386/11/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/notify-osd-ci/11//rebuild/?

review: Approve (continuous-integration)

Unmerged revisions

462. By Jussi Pakkanen on 2013-02-25

Enable separate build directory and fixed incorrect use of AM_MAINTAINER_MODE.

=== modified file 'configure.in'
--- configure.in	2012-03-23 14:35:42 +0000
+++ configure.in	2013-02-25 12:41:23 +0000
@@ -9,7 +9,7 @@
 GNOME_COMMON_INIT
 GNOME_COMPILE_WARNINGS(maximum)
 
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
 AM_DISABLE_STATIC
 AM_PROG_LIBTOOL
 AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2011-11-01 12:45:48 +0000
+++ tests/Makefile.am	2013-02-25 12:41:23 +0000
@@ -63,7 +63,8 @@
 	$(LIBNOTIFY_CFLAGS)	\
 	-DSRCDIR=\""$(top_srcdir)"\" \
 	-I$(top_srcdir)/src	\
-	-I$(top_srcdir)/
+	-I$(top_srcdir)/ \
+	-I$(top_builddir)/src
 
 test_modules_LDADD =		\
 	$(LIBM)			\