[anjuta] language-support-plugin: cxxparser compiled statically.

[Massimo Cora' <mcora src gnome org>]

commit 2fecbd42c6520ed9dd1358233915a88681136339
Author: Massimo Corà <mcora src gnome org>
Date:   Tue Dec 8 02:05:16 2009 +0100

    language-support-plugin: cxxparser compiled statically.
    
    Added code to include cxxparser engine inside lsp.

 plugins/language-support-cpp-java/Makefile.am      |    3 ++-
 .../language-support-cpp-java/cpp-java-assist.c    |    6 ++++++
 .../cxxparser/Makefile.am                          |    6 +++---
 .../cxxparser/engine-parser.h                      |    2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/plugins/language-support-cpp-java/Makefile.am b/plugins/language-support-cpp-java/Makefile.am
index fa131ae..e619858 100644
--- a/plugins/language-support-cpp-java/Makefile.am
+++ b/plugins/language-support-cpp-java/Makefile.am
@@ -56,7 +56,8 @@ libanjuta_language_cpp_java_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 # Plugin dependencies
 libanjuta_language_cpp_java_la_LIBADD = \
-	$(LIBANJUTA_LIBS)
+	$(LIBANJUTA_LIBS) \
+	cxxparser/libcxxparser.a
 	
 prefs_ui_files = anjuta-language-cpp-java.ui
 include $(top_srcdir)/scripts/build-schemas.mk
diff --git a/plugins/language-support-cpp-java/cpp-java-assist.c b/plugins/language-support-cpp-java/cpp-java-assist.c
index e196820..191ee41 100644
--- a/plugins/language-support-cpp-java/cpp-java-assist.c
+++ b/plugins/language-support-cpp-java/cpp-java-assist.c
@@ -23,6 +23,8 @@
  * 	Boston, MA  02110-1301, USA.
  */
 
+#include "cxxparser/engine-parser.h"
+
 #include <ctype.h>
 #include <string.h>
 #include <libanjuta/anjuta-debug.h>
@@ -894,6 +896,10 @@ cpp_java_assist_new (IAnjutaEditor *ieditor,
 	assist->priv->isymbol_manager = isymbol_manager;
 	assist->priv->preferences = prefs;
 	cpp_java_assist_install (assist, ieditor);
+
+	/* FIXME ? */
+	engine_parser_init (isymbol_manager);	
+	
 	return assist;
 }
 
diff --git a/plugins/language-support-cpp-java/cxxparser/Makefile.am b/plugins/language-support-cpp-java/cxxparser/Makefile.am
index ec30aa5..0e204a0 100644
--- a/plugins/language-support-cpp-java/cxxparser/Makefile.am
+++ b/plugins/language-support-cpp-java/cxxparser/Makefile.am
@@ -16,9 +16,9 @@ AM_CFLAGS =\
 	 -Wall\
 	 -g
 
-lib_LTLIBRARIES = libcxxparser.la
+noinst_LIBRARIES = libcxxparser.a
 
-libcxxparser_la_SOURCES = \
+libcxxparser_a_SOURCES = \
         expression-lexer.cpp \
         expression-parser.cpp \
         expression-result.cpp \
@@ -44,5 +44,5 @@ libcxxparser_la_SOURCES = \
         scope-parser.h \
         variable-parser.h 
  
-libcxxparser_la_LIBADD =   $(LIBANJUTA_LIBS) 
+libcxxparser_a_LIBADD = $(LIBANJUTA_LIBS) 
 
diff --git a/plugins/language-support-cpp-java/cxxparser/engine-parser.h b/plugins/language-support-cpp-java/cxxparser/engine-parser.h
index 2ee363e..913b3a1 100644
--- a/plugins/language-support-cpp-java/cxxparser/engine-parser.h
+++ b/plugins/language-support-cpp-java/cxxparser/engine-parser.h
@@ -24,7 +24,7 @@
 extern "C" {
 #endif
 
-//#include <libanjuta/interfaces/ianjuta-symbol-manager.h>		
+#include <libanjuta/interfaces/ianjuta-symbol-manager.h>		
 
 // FIXME: actually a dbe instance is passed. Change here when integrating with Anjuta.
 void engine_parser_init (IAnjutaSymbolManager * manager);