[evolution/foocanvas: 2/4] Wire up the build system to use libfoocanvas.



commit f91519815f8597a25f7787fba2dffff2876c170c
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Jan 13 15:06:01 2010 -0500

    Wire up the build system to use libfoocanvas.

 configure.ac             |    3 +--
 widgets/Makefile.am      |    1 +
 widgets/misc/Makefile.am |   15 ++++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index da093d7..e6cc38c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ m4_define([gnome_desktop_minimum_version], [2.26.0])
 m4_define([libgtkhtml_minimum_version], [3.29.6])
 m4_define([gconf_minimum_version], [2.0.0])		dnl XXX Just a Guess
 m4_define([libsoup_minimum_version], [2.4.0])		dnl XXX Just a Guess
-m4_define([libgnomecanvas_minimum_version], [2.0.0])	dnl XXX Just a Guess
 m4_define([libxml_minimum_version], [2.7.3])
 m4_define([shared_mime_info_minimum_version], [0.22])
 m4_define([libpst_minimum_version], [0.6.41])
@@ -222,7 +221,6 @@ PKG_CHECK_MODULES([GNOME_PLATFORM],
 	 gthread-2.0 >= glib_minimum_version
 	 gtk+-2.0 >= gtk_minimum_version
 	 gconf-2.0 >= gconf_minimum_version
-	 libgnomecanvas-2.0 >= libgnomecanvas_minimum_version
 	 libxml-2.0 >= libxml_minimum_version
 	 shared-mime-info >= shared_mime_info_minimum_version
 	 gnome-desktop-2.0 >= gnome_desktop_minimum_version
@@ -1706,6 +1704,7 @@ views/tasks/Makefile
 views/memos/Makefile
 widgets/Makefile
 widgets/e-timezone-dialog/Makefile
+widgets/libfoocanvas/Makefile
 widgets/menus/Makefile
 widgets/misc/Makefile
 widgets/text/Makefile
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
index 137446c..c874b0b 100644
--- a/widgets/Makefile.am
+++ b/widgets/Makefile.am
@@ -1,5 +1,6 @@
 
 SUBDIRS =			\
+	libfoocanvas		\
 	misc			\
 	text			\
 	e-timezone-dialog	\
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 9a33f48..31f5adc 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -154,13 +154,14 @@ libemiscwidgets_la_SOURCES =			\
 
 libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED)
 
-libemiscwidgets_la_LIBADD =				\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(top_builddir)/filter/libfilter.la		\
-	$(top_builddir)/a11y/libevolution-a11y.la	\
-	$(EVOLUTION_MAIL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)				\
-	$(MATH_LIB)					\
+libemiscwidgets_la_LIBADD =					\
+	$(top_builddir)/e-util/libeutil.la			\
+	$(top_builddir)/filter/libfilter.la			\
+	$(top_builddir)/a11y/libevolution-a11y.la		\
+	$(top_builddir)/widgets/libfoocanvas/libfoocanvas.la	\
+	$(EVOLUTION_MAIL_LIBS)					\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(MATH_LIB)						\
 	$(ICONV_LIBS)
 
 noinst_PROGRAMS = 			\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]