Unity

Merge lp:~unity-team/unity/unity.install_dotpc into lp:unity

  1. unity.install_dotpc
  2. Merge into trunk
Proposed by Mikkel Kamstrup Erlandsen
Status: Merged
Merged at revision: 314
Proposed branch: lp:~unity-team/unity/unity.install_dotpc
Merge into: lp:unity
Diff against target: 44 lines (+18/-1)
3 files modified
Makefile.am (+5/-1)
configure.ac (+1/-0)
unity.pc.in (+12/-0)
To merge this branch: bzr merge lp:~unity-team/unity/unity.install_dotpc
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+27023@code.launchpad.net

Description of the change

See commit message

To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2010-04-29 12:29:36 +0000
3+++ Makefile.am 2010-06-08 08:57:26 +0000
4@@ -22,6 +22,10 @@
5 echo Failed to generate ChangeLog: not a branch >&2; \
6 fi
7
8+pkgconfigdir = $(libdir)/pkgconfig
9+pkgconfig_DATA = unity.pc
10+
11 EXTRA_DIST = \
12 autogen.sh \
13- COPYING
14+ COPYING \
15+ unity.pc.in
16
17=== modified file 'configure.ac'
18--- configure.ac 2010-06-04 17:03:39 +0000
19+++ configure.ac 2010-06-08 08:57:26 +0000
20@@ -161,6 +161,7 @@
21 dnl Create the Makefiles
22 AC_CONFIG_FILES([
23 Makefile
24+ unity.pc
25 data/Makefile
26 targets/Makefile
27 targets/mutter/Makefile
28
29=== added file 'unity.pc.in'
30--- unity.pc.in 1970-01-01 00:00:00 +0000
31+++ unity.pc.in 2010-06-08 08:57:26 +0000
32@@ -0,0 +1,12 @@
33+prefix=@prefix@
34+exec_prefix=@exec_prefix@
35+libdir=@libdir@
36+includedir=@includedir@
37+
38+Name: @PACKAGE_NAME@
39+Description: Library for developing services integrating with the Unity Shell
40+Version: @VERSION@
41+Libs: -L${libdir} -lunity
42+Cflags: -I${includedir}/unity/unity
43+Requires: glib-2.0 gthread-2.0 gobject-2.0 gio-2.0 gio-unix-2.0 dbus-glib-1 gtk+-2.0 clutter-1.0 clutk-0.3 dee-1.0 gee-1.0
44+