BAMF

Merge lp:~mhr3/bamf/fix-non-srcdir-build into lp:bamf/0.4

  1. fix-non-srcdir-build
  2. Merge into 0.4
Proposed by Michal Hruby on 2012-07-31
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2012-07-31
Approved revision: 477
Merged at revision: 477
Proposed branch: lp:~mhr3/bamf/fix-non-srcdir-build
Merge into: lp:bamf/0.4
Diff against target: 30 lines (+2/-4)
1 file modified
lib/libbamf/Makefile.am (+2/-4)
To merge this branch: bzr merge lp:~mhr3/bamf/fix-non-srcdir-build
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2012-07-31 Approve on 2012-07-31
Review via email: mp+117469@code.launchpad.net

Commit Message

Fix non-srcdir build

Description of the Change

Fix non-srcdir build

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks, this works!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/libbamf/Makefile.am'
2--- lib/libbamf/Makefile.am 2012-07-28 17:44:24 +0000
3+++ lib/libbamf/Makefile.am 2012-07-31 15:53:21 +0000
4@@ -24,7 +24,6 @@
5 bamf-tab-source.c \
6 bamf-tab.c \
7 bamf-indicator.c \
8- bamf-marshal.c \
9 $(NULL)
10
11 sources_h = \
12@@ -45,8 +44,7 @@
13 bamf-view-private.h \
14 $(sources_h) \
15 $(libbamf_sources) \
16- bamf-tab-source-glue.h \
17- bamf-marshal.h \
18+ $(BUILT_SOURCES) \
19 $(NULL)
20
21 libbamf_la_LIBADD = \
22@@ -126,7 +124,7 @@
23 -I$(top_builddir)/lib \
24 $(NULL)
25 Bamf_0_2_gir_LIBS = libbamf.la
26-Bamf_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
27+Bamf_0_2_gir_FILES = $(introspection_sources)
28 Bamf_0_2_gir_EXPORT_PACKAGES = libbamf$(VER)
29
30 INTROSPECTION_GIRS += Bamf-0.2.gir

Subscribers

People subscribed via source and target branches