Application Indicators

Merge lp:~ted/indicator-application/lib-deps-fixes into lp:indicator-application/0.4

  1. lib-deps-fixes
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merge reported by: Ted Gould
Merged at revision: not available
Proposed branch: lp:~ted/indicator-application/lib-deps-fixes
Merge into: lp:indicator-application/0.4
Diff against target: 36 lines (+9/-2)
2 files modified
configure.ac (+7/-0)
src/Makefile.am (+2/-2)
To merge this branch: bzr merge lp:~ted/indicator-application/lib-deps-fixes
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+36345@code.launchpad.net

Description of the change

Creates a separate package config line for the library which removes the extra deps, most notably on libindicator.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2010-09-22 16:13:14 +0000
3+++ configure.ac 2010-09-22 16:49:43 +0000
4@@ -52,6 +52,13 @@
5 AC_SUBST(INDICATOR_CFLAGS)
6 AC_SUBST(INDICATOR_LIBS)
7
8+PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION
9+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
10+ dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION)
11+
12+AC_SUBST(LIBRARY_CFLAGS)
13+AC_SUBST(LIBRARY_LIBS)
14+
15 ###########################
16 # GObject Introspection
17 ###########################
18
19=== modified file 'src/Makefile.am'
20--- src/Makefile.am 2010-08-10 21:59:25 +0000
21+++ src/Makefile.am 2010-09-22 16:49:43 +0000
22@@ -108,12 +108,12 @@
23 -export-symbols-regex "^[^_d].*"
24
25 libappindicator_la_CFLAGS = \
26- $(INDICATOR_CFLAGS) \
27+ $(LIBRARY_CFLAGS) \
28 -Wall -Werror \
29 -DG_LOG_DOMAIN=\"libappindicator\"
30
31 libappindicator_la_LIBADD = \
32- $(INDICATOR_LIBS)
33+ $(LIBRARY_LIBS)
34
35 ##################################
36 # DBus Specs

Subscribers

People subscribed via source and target branches