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

Proposed by Jussi Pakkanen on 2013-02-25
Status: Needs review
Proposed branch: lp:~jpakkane/notify-osd/builddir
Merge into: lp:notify-osd
Diff against target: 26 lines (+3/-2)
2 files modified
configure.in (+1/-1)
tests/Makefile.am (+2/-1)
To merge this branch: bzr merge lp:~jpakkane/notify-osd/builddir
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-02-25
Indicator Applet Developers 2013-02-25 Pending
Review via email: mp+150311@code.launchpad.net

Commit message

Make it build in a separate build directory.

Description of the change

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

Unmerged revisions

462. By Jussi Pakkanen on 2013-02-25

Enable separate build directory and fixed incorrect use of AM_MAINTAINER_MODE.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.in'
2--- configure.in 2012-03-23 14:35:42 +0000
3+++ configure.in 2013-02-25 12:41:23 +0000
4@@ -9,7 +9,7 @@
5 GNOME_COMMON_INIT
6 GNOME_COMPILE_WARNINGS(maximum)
7
8-AM_MAINTAINER_MODE
9+AM_MAINTAINER_MODE([enable])
10 AM_DISABLE_STATIC
11 AM_PROG_LIBTOOL
12 AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
13
14=== modified file 'tests/Makefile.am'
15--- tests/Makefile.am 2011-11-01 12:45:48 +0000
16+++ tests/Makefile.am 2013-02-25 12:41:23 +0000
17@@ -63,7 +63,8 @@
18 $(LIBNOTIFY_CFLAGS) \
19 -DSRCDIR=\""$(top_srcdir)"\" \
20 -I$(top_srcdir)/src \
21- -I$(top_srcdir)/
22+ -I$(top_srcdir)/ \
23+ -I$(top_builddir)/src
24
25 test_modules_LDADD = \
26 $(LIBM) \

Subscribers

People subscribed via source and target branches