launchpad-integration

Merge lp:~mterry/launchpad-integration/fix-packages into lp:launchpad-integration

  1. fix-packages
  2. Merge into ubuntu
Proposed by Michael Terry
Status: Merged
Merged at revision: 168
Proposed branch: lp:~mterry/launchpad-integration/fix-packages
Merge into: lp:launchpad-integration
Diff against target: 13 lines (+2/-1)
1 file modified
lib/Makefile.am (+2/-1)
To merge this branch: bzr merge lp:~mterry/launchpad-integration/fix-packages
Reviewer Review Type Date Requested Status
Michael Terry Pending
Review via email: mp+47453@code.launchpad.net

Description of the change

The _PACKAGES makefile bit is for pkg-config packages USED by the library, and _EXPORT_PACKAGES is for pkg-config packages DEFINED by the library.

This fixes a failure to build in Ubuntu.

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Oh, I can merge this. Will do.

Revision history for this message
Michael Terry (mterry) wrote :

Scratch that, I can merge but wouldn't be able to push to Ubuntu. I'll let some one else review/push then.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/Makefile.am'
2--- lib/Makefile.am 2010-12-16 20:34:56 +0000
3+++ lib/Makefile.am 2011-01-25 19:53:04 +0000
4@@ -41,7 +41,8 @@
5
6 if USE_GTK3
7 LaunchpadIntegration-3.0.gir: $(lpilib) Makefile
8-LaunchpadIntegration_3_0_gir_PACKAGES = launchpad-integration
9+LaunchpadIntegration_3_0_gir_PACKAGES = gtk+-3.0
10+LaunchpadIntegration_3_0_gir_EXPORT_PACKAGES = launchpad-integration-3.0
11 LaunchpadIntegration_3_0_gir_INCLUDES = Gtk-3.0
12 LaunchpadIntegration_3_0_gir_CFLAGS = $(INCLUDES)
13 LaunchpadIntegration_3_0_gir_LIBS = $(lpilib)

Subscribers

People subscribed via source and target branches

to all changes: