Merge lp://staging/~amigadave/account-plugins/no-binary-plugins into lp://staging/account-plugins

Proposed by David King
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 86
Merged at revision: 77
Proposed branch: lp://staging/~amigadave/account-plugins/no-binary-plugins
Merge into: lp://staging/account-plugins
Diff against target: 764 lines (+136/-545)
11 files modified
Makefile.am (+105/-18)
configure.ac (+31/-19)
data/Makefile.am (+0/-5)
data/icons/Makefile.am (+0/-25)
data/providers/Makefile.am (+0/-23)
data/webkit-options/Makefile.am (+0/-11)
src/AccountPlugin.vapi (+0/-72)
src/accounts.deps (+0/-1)
src/accounts.vapi (+0/-200)
src/signon.vapi (+0/-166)
tools/Makefile.am (+0/-5)
To merge this branch: bzr merge lp://staging/~amigadave/account-plugins/no-binary-plugins
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+134045@code.staging.launchpad.net

Description of the change

Allow building without binary account plugins

Also, refactor the build to use non-recursive make.

To post a comment you must log in.
Revision history for this message
Alberto Mardegan (mardy) wrote :

Great work!!

There's only one thing missing: you didn't flatten the tools/Makefile.am, and you are not invoking it, so the account-console tool is not installed.

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
77. By David King

Depend on pkg-config 0.24

Tidy configure slightly by depending on a more recent pkg-config.

78. By David King

Add ability to disable binary plugins at configure time

79. By David King

Remove old VAPI files

The VAPI files are distributed and installed by the upstream projects.

80. By David King

Minor improvements to some Makefiles

81. By David King

Distcheck with --enable-libaccount-plugn

82. By David King

Convert tools subdirectory to non-recursive build

83. By David King

Convert icons subdirectory to non-recursive build

84. By David King

Make providers subdirectory build non-recursively

85. By David King

Convert services subdirectory to non-recursive build

86. By David King

Switch webkit-options subdirectory to build non-recursively

Revision history for this message
David King (amigadave) wrote :

Updated now, seems that I had added the tools/Makefile.am changes and then removed them in a later commit. After much Bazaar (bizarre?) surgery, this now looks about right.

Revision history for this message
Alberto Mardegan (mardy) wrote :

Works fine now, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches