Merge lp:~oif-team/libgrip/remove-version into lp:libgrip

Proposed by Chase Douglas
Status: Merged
Merged at revision: 46
Proposed branch: lp:~oif-team/libgrip/remove-version
Merge into: lp:libgrip
Prerequisite: lp:~oif-team/libgrip/device-types
Diff against target: 116 lines (+19/-19)
4 files modified
Makefile.am (+4/-4)
examples/rectangle-mover/Makefile.am (+1/-1)
libgrip.pc.in (+2/-2)
src/Makefile.am (+12/-12)
To merge this branch: bzr merge lp:~oif-team/libgrip/remove-version
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Review via email: mp+64581@code.launchpad.net

Description of the change

Remove the version number from the library name. It's just going to cause trouble in the future, and we have no plans to support multiple versions simultaneously.

To post a comment you must log in.
lp:~oif-team/libgrip/remove-version updated
47. By Chase Douglas

Remove the version number from the library name

This will make it easier to maintain since we only plan to support one
version of libgrip at any time.

Revision history for this message
Stephen M. Webb (bregma) wrote :

Seems to build and install OK.

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 2011-03-09 03:00:31 +0000
3+++ Makefile.am 2011-06-14 17:41:32 +0000
4@@ -1,12 +1,12 @@
5 SUBDIRS = src bindings examples/rectangle-mover
6
7-libgrip-0.1.pc: libgrip.pc
8- cp -f libgrip.pc libgrip-0.1.pc
9+libgrip.pc: libgrip.pc
10+ cp -f libgrip.pc libgrip.pc
11
12 pkgconfigdir = $(libdir)/pkgconfig
13-pkgconfig_DATA = libgrip-0.1.pc
14+pkgconfig_DATA = libgrip.pc
15
16-CLEANFILES = libgrip-0.1.pc
17+CLEANFILES = libgrip.pc
18 DISTCLEANFILES = libgrip.pc grip*.tar.gz
19 EXTRA_DIST = libgrip.pc.in m4/introspection.m4
20
21
22=== modified file 'examples/rectangle-mover/Makefile.am'
23--- examples/rectangle-mover/Makefile.am 2011-02-04 19:08:39 +0000
24+++ examples/rectangle-mover/Makefile.am 2011-06-14 17:41:32 +0000
25@@ -12,4 +12,4 @@
26 $(GTK_CFLAGS) \
27 $(MAINTAINER_CFLAGS)
28
29-grip_test_LDADD = $(top_builddir)/src/libgrip-0.1.la $(GTK_LIBS)
30+grip_test_LDADD = $(top_builddir)/src/libgrip.la $(GTK_LIBS)
31
32=== modified file 'libgrip.pc.in'
33--- libgrip.pc.in 2011-05-23 10:42:34 +0000
34+++ libgrip.pc.in 2011-06-14 17:41:32 +0000
35@@ -6,6 +6,6 @@
36 Name: libgrip
37 Description: Multitouch gesture library
38 Version: @VERSION@
39-Libs: -L${libdir} -lgrip-0.1
40-Cflags: -I${includedir}/libgrip-0.1
41+Libs: -L${libdir} -lgrip
42+Cflags: -I${includedir}/libgrip
43 Requires: gtk+-3.0
44
45=== modified file 'src/Makefile.am'
46--- src/Makefile.am 2011-03-06 15:19:16 +0000
47+++ src/Makefile.am 2011-06-14 17:41:32 +0000
48@@ -1,5 +1,5 @@
49 grip_version_script = \
50- $(srcdir)/libgrip-0.1.ver
51+ $(srcdir)/libgrip.ver
52
53 grip_built_public_sources = \
54 griptypebuiltins.h
55@@ -38,21 +38,21 @@
56 introspection_sources = $(patsubst %,$(srcdir)/%,$(sources_h))
57
58 irscanner_headers = $(patsubst %,$(srcdir)/%,$(sources_h))
59-Grip-0.1.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
60+Grip.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
61 $(INTROSPECTION_SCANNER) \
62 -v --namespace Grip \
63- --nsversion=0.1 \
64+ --nsversion=0.2 \
65 --warn-all \
66 --libtool=$(top_builddir)/libtool \
67 --add-include-path=$(srcdir) $(GTK_CFLAGS) \
68 --include=GObject-2.0 \
69 --include=GLib-2.0 \
70 --include=Gtk-2.0 \
71- --library=grip-0.1 \
72- --output Grip-0.1.gir $(irscanner_headers) \
73+ --library=grip \
74+ --output Grip.gir $(irscanner_headers) \
75 $(addprefix --c-include=src/, $(grip_headers))
76
77-BUILT_GIRSOURCES += Grip-0.1.gir
78+BUILT_GIRSOURCES += Grip.gir
79
80 girdir = $(datadir)/gir-1.0
81 gir_DATA = $(BUILT_GIRSOURCES)
82@@ -90,26 +90,26 @@
83 $(GEIS_CFLAGS) \
84 $(MAINTAINER_CFLAGS)
85
86-lib_LTLIBRARIES = libgrip-0.1.la
87+lib_LTLIBRARIES = libgrip.la
88
89-libgrip_0_1_la_SOURCES = \
90+libgrip_la_SOURCES = \
91 gripgesturemanager.c \
92 griptypebuiltins.c
93
94-libgripincludedir=$(includedir)/libgrip-0.1/libgrip
95+libgripincludedir=$(includedir)/libgrip
96
97 libgripinclude_HEADERS = \
98 gripgesturemanager.h \
99 grip.h
100
101-libgrip_0_1_la_LIBADD = $(GTK_LIBS) $(GEIS_LIBS)
102-libgrip_0_1_la_LDFLAGS = \
103+libgrip_la_LIBADD = $(GTK_LIBS) $(GEIS_LIBS)
104+libgrip_la_LDFLAGS = \
105 -Wl,-z,defs -Wl,--as-needed \
106 -Wl,--version-script=$(grip_version_script) \
107 $(GRIP_LT_LDFLAGS) \
108 $(GTK_LT_LDFLAGS)
109
110-gripheadersdir = $(includedir)/grip-0.1/grip
111+gripheadersdir = $(includedir)/grip
112
113 DISTCLEANFILES = \
114 stamp-griptypebuiltins.h \
115
116=== renamed file 'src/libgrip-0.1.ver' => 'src/libgrip.ver'

Subscribers

People subscribed via source and target branches

to all changes: