libappindicator

Merge lp:~ballogy/libappindicator/build-fixes into lp:libappindicator

  1. build-fixes
  2. Merge into trunk
Proposed by Balló György
Status: Superseded
Proposed branch: lp:~ballogy/libappindicator/build-fixes
Merge into: lp:libappindicator
Diff against target: 50 lines (+4/-4)
4 files modified
bindings/mono/Makefile.am (+1/-1)
bindings/mono/appindicator-sharp-0.1.pc.in (+1/-1)
bindings/python/Makefile.am (+1/-1)
src/appindicator3-0.1.pc.in (+1/-1)
To merge this branch: bzr merge lp:~ballogy/libappindicator/build-fixes
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+83076@code.launchpad.net

This proposal has been superseded by a proposal from 2012-01-27.

Description of the change

This change contains some build fixes for the following problems:

1. Currently, the header files of GTK3 version of the library installed into /usr/include/libappindicator3-0.1 directory, but /usr/include/libappindicator-0.1 defined in appindicator3-0.1.pc.

2. Do not link pyglib explicitly, because the name of the pyglib library may differ between systems, and it seems that it builds without explicit linking.

3. Currently, mono files are installed into a non-standard /usr/lib/cli/appindicator-sharp-0.1 directory instead of /usr/lib/mono/appindicator-sharp. (Debian/Ubuntu should use a distro specific downstream patch.)

To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bindings/mono/Makefile.am'
2--- bindings/mono/Makefile.am 2011-02-24 04:46:17 +0000
3+++ bindings/mono/Makefile.am 2011-11-22 21:38:25 +0000
4@@ -29,7 +29,7 @@
5 $(DLLPOLICY1) \
6 $(POLICY1).config
7
8-assemblydir = $(libdir)/cli/appindicator-sharp-0.1
9+assemblydir = $(libdir)/mono/appindicator-sharp
10 assembly_DATA = $(TARGET)
11
12 CLEANFILES = \
13
14=== modified file 'bindings/mono/appindicator-sharp-0.1.pc.in'
15--- bindings/mono/appindicator-sharp-0.1.pc.in 2010-05-23 10:44:53 +0000
16+++ bindings/mono/appindicator-sharp-0.1.pc.in 2011-11-22 21:38:25 +0000
17@@ -1,7 +1,7 @@
18 prefix=@prefix@
19 exec_prefix=@exec_prefix@
20 libdir=@libdir@
21-assemblies_dir=${libdir}/cli/appindicator-sharp-0.1
22+assemblies_dir=${libdir}/mono/appindicator-sharp
23
24 Name: appindicator-sharp
25 Description: application indicators for .NET
26
27=== modified file 'bindings/python/Makefile.am'
28--- bindings/python/Makefile.am 2009-12-12 02:29:28 +0000
29+++ bindings/python/Makefile.am 2011-11-22 21:38:25 +0000
30@@ -19,7 +19,7 @@
31 appindicatordir = $(pkgpyexecdir)/appindicator
32 appindicator_LTLIBRARIES = _appindicator.la
33
34-_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator -lpyglib-2.0-python2.6
35+_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator
36 _appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator
37 _appindicator_la_SOURCES = appindicatormodule.c
38 nodist__appindicator_la_SOURCES = appindicator.c
39
40=== modified file 'src/appindicator3-0.1.pc.in'
41--- src/appindicator3-0.1.pc.in 2011-03-01 04:34:45 +0000
42+++ src/appindicator3-0.1.pc.in 2011-11-22 21:38:25 +0000
43@@ -4,7 +4,7 @@
44 bindir=@bindir@
45 includedir=@includedir@
46
47-Cflags: -I${includedir}/libappindicator-0.1
48+Cflags: -I${includedir}/libappindicator3-0.1
49 Requires: dbusmenu-glib-0.4 gtk+-3.0
50 Libs: -L${libdir} -lappindicator3
51

Subscribers

People subscribed via source and target branches