Merge lp:~evgeni/libappindicator/multiarch-same-devheaders into lp:libappindicator/12.10

Proposed by Evgeni Golov
Status: Merged
Approved by: Charles Kerr
Approved revision: 241
Merged at revision: 241
Proposed branch: lp:~evgeni/libappindicator/multiarch-same-devheaders
Merge into: lp:libappindicator/12.10
Diff against target: 25 lines (+2/-2)
2 files modified
src/app-indicator-enum-types.c.in (+1/-1)
src/app-indicator-enum-types.h.in (+1/-1)
To merge this branch: bzr merge lp:~evgeni/libappindicator/multiarch-same-devheaders
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+109511@code.launchpad.net

Description of the change

don't include build-time filenames in comments of the enum header files

If we do, the header files may be different on each build.
This is especially harmful when building multiple times for multiple
architectures and expecting the files to be identical.

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) wrote :

Thanks Evgeni!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app-indicator-enum-types.c.in'
2--- src/app-indicator-enum-types.c.in 2010-05-23 10:44:53 +0000
3+++ src/app-indicator-enum-types.c.in 2012-06-10 08:39:21 +0000
4@@ -32,7 +32,7 @@
5 /*** END file-header ***/
6
7 /*** BEGIN file-production ***/
8-#include "@filename@"
9+#include "@basename@"
10 /*** END file-production ***/
11
12 /*** BEGIN value-header ***/
13
14=== modified file 'src/app-indicator-enum-types.h.in'
15--- src/app-indicator-enum-types.h.in 2010-05-23 10:44:53 +0000
16+++ src/app-indicator-enum-types.h.in 2012-06-10 08:39:21 +0000
17@@ -44,7 +44,7 @@
18 /*** END file-tail ***/
19
20 /*** BEGIN file-production ***/
21-/* Enumerations from file: "@filename@" */
22+/* Enumerations from file: "@basename@" */
23 /*** END file-production ***/
24
25 /*** BEGIN value-header ***/

Subscribers

People subscribed via source and target branches