[anjuta/class-inheritance-yap: 2/3] class-inheritance: Enabled class-inheritance and switched to using goocanvas

[Naba Kumar <naba src gnome org>]

commit 54177ed5bcda40ca8da1720c5e3c94f87b26a608
Author: Naba Kumar <naba gnome org>
Date:   Sun Jun 12 20:40:47 2011 +0300

    class-inheritance: Enabled class-inheritance and switched to using goocanvas

 Makefile.am                           |    4 ++--
 configure.ac                          |   10 ++++++----
 plugins/Makefile.am                   |    1 +
 plugins/class-inheritance/Makefile.am |    4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d992748..d245b89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = \
 	pixmaps scripts data \
-	doc libanjuta plugins src manuals mime launcher po
+	doc libanjuta plugins libgoocanvas src manuals mime launcher po
 
 anjutadocdir = $(docdir)
 anjutadoc_DATA = \
@@ -40,7 +40,7 @@ EXTRA_DIST = \
 
 gnomerelease:
 	scp *.tar.bz2 master.gnome.org:
-	
+
 sfrelease:
 	scp *.tar.bz2 clubfan frs sf net:uploads
 
diff --git a/configure.ac b/configure.ac
index 9341a1c..e81ac95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,10 +293,10 @@ AC_SUBST(LIBANJUTA_LIBS)
 
 dnl Setup FooCanvas Library flags
 dnl --------------------------
-LIBFOOCANVAS_CFLAGS='-I$(top_srcdir)'
-LIBFOOCANVAS_LIBS='$(top_builddir)/libfoocanvas/libanjuta-foocanvas.la'
-AC_SUBST(LIBFOOCANVAS_CFLAGS)
-AC_SUBST(LIBFOOCANVAS_LIBS)
+LIBGOOCANVAS_CFLAGS='-I$(top_srcdir)/libgoocanvas'
+LIBGOOCANVAS_LIBS='$(top_builddir)/libgoocanvas/libanjuta-goocanvas-2.0.la'
+AC_SUBST(LIBGOOCANVAS_CFLAGS)
+AC_SUBST(LIBGOOCANVAS_LIBS)
 
 dnl Checks for Xft/XRender for foocanvas
 dnl
@@ -714,6 +714,7 @@ libanjuta/tests/Makefile
 libanjuta/interfaces/Makefile
 libanjuta/libanjuta-3.0.pc
 libanjuta/anjuta-version.h
+libgoocanvas/Makefile
 src/Makefile
 pixmaps/Makefile
 pixmaps/16x16/Makefile
@@ -732,6 +733,7 @@ launcher/Makefile
 plugins/Makefile
 plugins/class-gen/Makefile
 plugins/class-gen/templates/Makefile
+plugins/class-inheritance/Makefile
 plugins/code-analyzer/Makefile
 plugins/patch/Makefile
 plugins/document-manager/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 7cabc64..a6c60ed 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -5,6 +5,7 @@ SUBDIRS = . \
 	am-project \
 	build-basic-autotools \
 	class-gen \
+	class-inheritance \
 	code-analyzer \
 	cvs-plugin \
 	devhelp \
diff --git a/plugins/class-inheritance/Makefile.am b/plugins/class-inheritance/Makefile.am
index 09b8eb1..3b86e6c 100644
--- a/plugins/class-inheritance/Makefile.am
+++ b/plugins/class-inheritance/Makefile.am
@@ -24,7 +24,7 @@ cls_inheritance_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
 
 # Include paths
 AM_CPPFLAGS = \
-	$(LIBFOOCANVAS_CFLAGS) \
+	$(LIBGOOCANVAS_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	$(EXTRA_CFLAGS) \
 	$(GRAPHVIZ_CFLAGS) \
@@ -40,7 +40,7 @@ libanjuta_class_inheritance_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 # Plugin dependencies
 libanjuta_class_inheritance_la_LIBADD = \
-	$(LIBFOOCANVAS_LIBS) \
+	$(LIBGOOCANVAS_LIBS) \
 	$(LIBANJUTA_LIBS) \
 	$(GRAPHVIZ_LIBS)