From 3f34eeab520965a14afbeb678b8f186c7a63e616 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 14 Jun 2010 13:18:06 -0400
Subject: Drop the "2" from libgnomecanvas and libart_lgpl.

---
 libart_lgpl/Makefile.am    | 10 +++++-----
 libgnomecanvas/Makefile.am | 12 ++++++------
 widgets/misc/Makefile.am   |  4 ++--
 widgets/table/Makefile.am  |  4 ++--
 widgets/text/Makefile.am   |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/libart_lgpl/Makefile.am b/libart_lgpl/Makefile.am
index 8a3eb2e755..94aef9278f 100644
--- a/libart_lgpl/Makefile.am
+++ b/libart_lgpl/Makefile.am
@@ -1,16 +1,16 @@
-privsolib_LTLIBRARIES = libart_lgpl_2.la
+privsolib_LTLIBRARIES = libart_lgpl.la
 
 if OS_WIN32
 else
 libm = -lm
 endif
 
-libart_lgpl_2_la_CPPFLAGS = \
+libart_lgpl_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(top_srcdir) \
 	$(GNOME_PLATFORM_CFLAGS)
 
-libart_lgpl_2_la_SOURCES = \
+libart_lgpl_la_SOURCES = \
 	art_affine.c \
 	art_affine.h \
 	art_alphagamma.c \
@@ -94,9 +94,9 @@ libart_lgpl_2_la_SOURCES = \
 	art_vpath_svp.h \
 	libart.h
 
-libart_lgpl_2_la_LDFLAGS = $(NO_UNDEFINED)
+libart_lgpl_la_LDFLAGS = $(NO_UNDEFINED)
 
-libart_lgpl_2_la_LIBADD = \
+libart_lgpl_la_LIBADD = \
 	$(GNOME_PLATFORM_LIBS) \
 	$(libm)
 
diff --git a/libgnomecanvas/Makefile.am b/libgnomecanvas/Makefile.am
index 46fdcc81ef..26de2c6455 100644
--- a/libgnomecanvas/Makefile.am
+++ b/libgnomecanvas/Makefile.am
@@ -1,6 +1,6 @@
-privsolib_LTLIBRARIES = libgnomecanvas-2.la
+privsolib_LTLIBRARIES = libgnomecanvas.la
 
-libgnomecanvas_2_la_CPPFLAGS = \
+libgnomecanvas_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir) 				\
 	$(GNOME_PLATFORM_CFLAGS)			\
@@ -11,13 +11,13 @@ libgnomecanvas_2_la_CPPFLAGS = \
 	-DGNOMECANVASLOCALSTATEDIR=\""$(localstatedir)"\" 	\
 	-DG_LOG_DOMAIN=\"GnomeCanvas\"
 
-libgnomecanvas_2_la_LIBADD = \
-	$(top_builddir)/libart_lgpl/libart_lgpl_2.la	\
+libgnomecanvas_la_LIBADD = \
+	$(top_builddir)/libart_lgpl/libart_lgpl.la	\
 	$(GNOME_PLATFORM_LIBS)
 
-libgnomecanvas_2_la_LDFLAGS = $(NO_UNDEFINED)
+libgnomecanvas_la_LDFLAGS = $(NO_UNDEFINED)
 
-libgnomecanvas_2_la_SOURCES =			\
+libgnomecanvas_la_SOURCES =			\
 	gailcanvas.c				\
 	gailcanvas.h				\
 	gailcanvasgroup.c			\
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index a17baff61b..50d8064af3 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -160,8 +160,8 @@ libemiscwidgets_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/filter/libfilter.la			\
 	$(top_builddir)/a11y/libevolution-a11y.la		\
-	$(top_builddir)/libgnomecanvas/libgnomecanvas-2.la	\
-	$(top_builddir)/libart_lgpl/libart_lgpl_2.la		\
+	$(top_builddir)/libgnomecanvas/libgnomecanvas.la	\
+	$(top_builddir)/libart_lgpl/libart_lgpl.la		\
 	$(EVOLUTION_MAIL_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(MATH_LIB)						\
diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index 834f1550d2..a1fe865e45 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -172,8 +172,8 @@ libetable_la_LIBADD =						\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/widgets/text/libetext.la		\
-	$(top_builddir)/libgnomecanvas/libgnomecanvas-2.la	\
-	$(top_builddir)/libart_lgpl/libart_lgpl_2.la		\
+	$(top_builddir)/libgnomecanvas/libgnomecanvas.la	\
+	$(top_builddir)/libart_lgpl/libart_lgpl.la		\
 	$(E_UTIL_LIBS)						\
 	$(E_WIDGETS_LIBS)					\
 	$(MATH_LIB)						\
diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am
index a79473c20e..2577c6fe14 100644
--- a/widgets/text/Makefile.am
+++ b/widgets/text/Makefile.am
@@ -34,7 +34,7 @@ libetext_la_LIBADD = 						\
 	$(top_builddir)/a11y/libevolution-a11y.la		\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
-	$(top_builddir)/libgnomecanvas/libgnomecanvas-2.la	\
+	$(top_builddir)/libgnomecanvas/libgnomecanvas.la	\
 	$(E_UTIL_LIBS)						\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(REGEX_LIBS)
-- 
cgit