libgrip

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

  1. remove-version
  2. Merge into trunk
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
=== modified file 'Makefile.am'
--- Makefile.am 2011-03-09 03:00:31 +0000
+++ Makefile.am 2011-06-14 17:41:32 +0000
@@ -1,12 +1,12 @@
1SUBDIRS = src bindings examples/rectangle-mover1SUBDIRS = src bindings examples/rectangle-mover
22
3libgrip-0.1.pc: libgrip.pc3libgrip.pc: libgrip.pc
4 cp -f libgrip.pc libgrip-0.1.pc4 cp -f libgrip.pc libgrip.pc
55
6pkgconfigdir = $(libdir)/pkgconfig6pkgconfigdir = $(libdir)/pkgconfig
7pkgconfig_DATA = libgrip-0.1.pc7pkgconfig_DATA = libgrip.pc
88
9CLEANFILES = libgrip-0.1.pc9CLEANFILES = libgrip.pc
10DISTCLEANFILES = libgrip.pc grip*.tar.gz10DISTCLEANFILES = libgrip.pc grip*.tar.gz
11EXTRA_DIST = libgrip.pc.in m4/introspection.m411EXTRA_DIST = libgrip.pc.in m4/introspection.m4
1212
1313
=== modified file 'examples/rectangle-mover/Makefile.am'
--- examples/rectangle-mover/Makefile.am 2011-02-04 19:08:39 +0000
+++ examples/rectangle-mover/Makefile.am 2011-06-14 17:41:32 +0000
@@ -12,4 +12,4 @@
12 $(GTK_CFLAGS) \12 $(GTK_CFLAGS) \
13 $(MAINTAINER_CFLAGS)13 $(MAINTAINER_CFLAGS)
1414
15grip_test_LDADD = $(top_builddir)/src/libgrip-0.1.la $(GTK_LIBS)15grip_test_LDADD = $(top_builddir)/src/libgrip.la $(GTK_LIBS)
1616
=== modified file 'libgrip.pc.in'
--- libgrip.pc.in 2011-05-23 10:42:34 +0000
+++ libgrip.pc.in 2011-06-14 17:41:32 +0000
@@ -6,6 +6,6 @@
6Name: libgrip6Name: libgrip
7Description: Multitouch gesture library7Description: Multitouch gesture library
8Version: @VERSION@8Version: @VERSION@
9Libs: -L${libdir} -lgrip-0.19Libs: -L${libdir} -lgrip
10Cflags: -I${includedir}/libgrip-0.110Cflags: -I${includedir}/libgrip
11Requires: gtk+-3.011Requires: gtk+-3.0
1212
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2011-03-06 15:19:16 +0000
+++ src/Makefile.am 2011-06-14 17:41:32 +0000
@@ -1,5 +1,5 @@
1grip_version_script = \1grip_version_script = \
2 $(srcdir)/libgrip-0.1.ver2 $(srcdir)/libgrip.ver
33
4grip_built_public_sources = \4grip_built_public_sources = \
5 griptypebuiltins.h5 griptypebuiltins.h
@@ -38,21 +38,21 @@
38introspection_sources = $(patsubst %,$(srcdir)/%,$(sources_h))38introspection_sources = $(patsubst %,$(srcdir)/%,$(sources_h))
3939
40irscanner_headers = $(patsubst %,$(srcdir)/%,$(sources_h))40irscanner_headers = $(patsubst %,$(srcdir)/%,$(sources_h))
41Grip-0.1.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am41Grip.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
42 $(INTROSPECTION_SCANNER) \42 $(INTROSPECTION_SCANNER) \
43 -v --namespace Grip \43 -v --namespace Grip \
44 --nsversion=0.1 \44 --nsversion=0.2 \
45 --warn-all \45 --warn-all \
46 --libtool=$(top_builddir)/libtool \46 --libtool=$(top_builddir)/libtool \
47 --add-include-path=$(srcdir) $(GTK_CFLAGS) \47 --add-include-path=$(srcdir) $(GTK_CFLAGS) \
48 --include=GObject-2.0 \48 --include=GObject-2.0 \
49 --include=GLib-2.0 \49 --include=GLib-2.0 \
50 --include=Gtk-2.0 \50 --include=Gtk-2.0 \
51 --library=grip-0.1 \51 --library=grip \
52 --output Grip-0.1.gir $(irscanner_headers) \52 --output Grip.gir $(irscanner_headers) \
53 $(addprefix --c-include=src/, $(grip_headers))53 $(addprefix --c-include=src/, $(grip_headers))
5454
55BUILT_GIRSOURCES += Grip-0.1.gir55BUILT_GIRSOURCES += Grip.gir
5656
57girdir = $(datadir)/gir-1.057girdir = $(datadir)/gir-1.0
58gir_DATA = $(BUILT_GIRSOURCES)58gir_DATA = $(BUILT_GIRSOURCES)
@@ -90,26 +90,26 @@
90 $(GEIS_CFLAGS) \90 $(GEIS_CFLAGS) \
91 $(MAINTAINER_CFLAGS)91 $(MAINTAINER_CFLAGS)
9292
93lib_LTLIBRARIES = libgrip-0.1.la93lib_LTLIBRARIES = libgrip.la
9494
95libgrip_0_1_la_SOURCES = \95libgrip_la_SOURCES = \
96 gripgesturemanager.c \96 gripgesturemanager.c \
97 griptypebuiltins.c97 griptypebuiltins.c
9898
99libgripincludedir=$(includedir)/libgrip-0.1/libgrip99libgripincludedir=$(includedir)/libgrip
100100
101libgripinclude_HEADERS = \101libgripinclude_HEADERS = \
102 gripgesturemanager.h \102 gripgesturemanager.h \
103 grip.h103 grip.h
104104
105libgrip_0_1_la_LIBADD = $(GTK_LIBS) $(GEIS_LIBS)105libgrip_la_LIBADD = $(GTK_LIBS) $(GEIS_LIBS)
106libgrip_0_1_la_LDFLAGS = \106libgrip_la_LDFLAGS = \
107 -Wl,-z,defs -Wl,--as-needed \107 -Wl,-z,defs -Wl,--as-needed \
108 -Wl,--version-script=$(grip_version_script) \108 -Wl,--version-script=$(grip_version_script) \
109 $(GRIP_LT_LDFLAGS) \109 $(GRIP_LT_LDFLAGS) \
110 $(GTK_LT_LDFLAGS)110 $(GTK_LT_LDFLAGS)
111111
112gripheadersdir = $(includedir)/grip-0.1/grip112gripheadersdir = $(includedir)/grip
113113
114DISTCLEANFILES = \114DISTCLEANFILES = \
115 stamp-griptypebuiltins.h \115 stamp-griptypebuiltins.h \
116116
=== renamed file 'src/libgrip-0.1.ver' => 'src/libgrip.ver'

Subscribers

People subscribed via source and target branches

to all changes: