libunity

Merge lp:~mhr3/libunity/autoconf-magic into lp:libunity

  1. autoconf-magic
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Mikkel Kamstrup Erlandsen
Approved revision: 95
Merged at revision: 94
Proposed branch: lp:~mhr3/libunity/autoconf-magic
Merge into: lp:libunity
Diff against target: 82 lines (+12/-9)
3 files modified
configure.ac (+7/-1)
src/Makefile.am (+4/-4)
test/Makefile.am (+1/-4)
To merge this branch: bzr merge lp:~mhr3/libunity/autoconf-magic
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Review via email: mp+84249@code.launchpad.net

Description of the change

Improved build system

To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Now that you are messing around with automake, you can maybe be
persuaded to fix the distcheck that you broke? ;-)

Revision history for this message
Michal Hruby (mhr3) wrote :

Oh, it didn't magically fix itself yet? :)

Pushed.

lp:~mhr3/libunity/autoconf-magic updated
95. By Michal Hruby

Fix distcheck

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Wunderbar!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2011-12-01 11:41:23 +0000
3+++ configure.ac 2011-12-02 14:42:27 +0000
4@@ -22,9 +22,15 @@
5 LIBUNITY_LT_VERSION="$LIBUNITY_LT_CURRENT:$LIBUNITY_LT_REV:$LIBUNITY_LT_AGE"
6 LIBUNITY_LT_LDFLAGS="-version-info $LIBUNITY_LT_VERSION -export-symbols-regex '^unity_.*'"
7
8+AC_SUBST(LIBUNITY_LT_CURRENT)
9 AC_SUBST(LIBUNITY_LT_VERSION)
10 AC_SUBST(LIBUNITY_LT_LDFLAGS)
11
12+GIR_MAJOR=5
13+GIR_MINOR=0
14+AC_SUBST([GIR_VERSION],[$GIR_MAJOR.$GIR_MINOR])
15+AC_DEFINE_UNQUOTED(GIR_VERSION, [$GIR_VERSION], [GIR version])
16+
17 ###################################################################
18 # Check essential build programs
19 ###################################################################
20@@ -33,7 +39,7 @@
21 AM_PROG_CC_STDC
22 AC_HEADER_STDC
23 AM_PROG_LIBTOOL
24-AM_PROG_VALAC([0.11.3])
25+AM_PROG_VALAC([0.12.1])
26
27 ###################################################################
28 # Check for Python - we need to know where to install overrides
29
30=== modified file 'src/Makefile.am'
31--- src/Makefile.am 2011-12-01 12:47:05 +0000
32+++ src/Makefile.am 2011-12-02 14:42:27 +0000
33@@ -24,7 +24,7 @@
34 $(AM_V_GEN)echo $(LIBUNITY_PACKAGES) | sed 's/--pkg /\n/g' | sed '/^$$/d' > $@
35
36 unitygirdir = $(datadir)/gir-1.0
37-unitygir_DATA = Unity-5.0.gir
38+unitygir_DATA = Unity-@GIR_VERSION@.gir
39
40 ##
41 # libunity
42@@ -55,7 +55,7 @@
43 libunity_la_VALAFLAGS = \
44 -C \
45 -H unity.h -d . \
46- --gir=Unity-5.0.gir \
47+ --gir=Unity-@GIR_VERSION@.gir \
48 --library unity \
49 --thread \
50 --use-header \
51@@ -99,7 +99,7 @@
52 libunity_la_GENERATED = \
53 unity.h \
54 unity.vapi \
55- Unity-5.0.gir
56+ Unity-@GIR_VERSION@.gir
57
58 BUILT_SOURCES += libunity_la_vala.stamp
59 EXTRA_DIST += \
60@@ -116,7 +116,7 @@
61 #
62 libunity_la_vala.stamp: $(libunity_la_VALASOURCES)
63 $(AM_V_GEN) $(VALAC) $(libunity_la_VALAFLAGS) $^
64- @sed -i -e 's@<namespace name="Unity" version="5.0" c:prefix="Unity">@<namespace name="Unity" version="5.0" c:prefix="Unity" shared-library="libunity.so.9">@g' Unity-5.0.gir
65+ @sed -i -e 's/<namespace name="Unity" version="@GIR_VERSION@" c:prefix="Unity">/<namespace name="Unity" version="@GIR_VERSION@" c:prefix="Unity" shared-library="libunity.so.@LIBUNITY_LT_CURRENT@">/g' Unity-@GIR_VERSION@.gir
66 @touch $@
67
68 CLEANFILES += \
69
70=== modified file 'test/Makefile.am'
71--- test/Makefile.am 2011-01-11 22:28:26 +0000
72+++ test/Makefile.am 2011-12-02 14:42:27 +0000
73@@ -2,8 +2,5 @@
74
75 EXTRA_DIST = \
76 data/applications/ubuntu-about.desktop \
77- data/place0.badplace \
78- data/place0.place \
79- data/place1.badplace \
80- data/place1.place \
81+ data/scope0.scope \
82 data/test_desktop_file.desktop

Subscribers

People subscribed via source and target branches