[anjuta] am-project: Fix parsing with quoted strings



commit 01464d0f14d19552cbf5c956a93dfec0efd389d9
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Wed Oct 12 20:59:41 2011 +0200

    am-project: Fix parsing with quoted strings

 plugins/am-project/ac-parser.y       |   14 +-
 plugins/am-project/ac-scanner.l      |    1 -
 plugins/am-project/am-scanner.l      |    5 +-
 plugins/am-project/amp-target.c      |   35 ++--
 plugins/am-project/tests/anjuta.lst  |  381 +++++++++++++++++-----------------
 plugins/am-project/tests/variable.at |    5 +-
 6 files changed, 224 insertions(+), 217 deletions(-)
---
diff --git a/plugins/am-project/ac-parser.y b/plugins/am-project/ac-parser.y
index ba5a452..4f0e791 100644
--- a/plugins/am-project/ac-parser.y
+++ b/plugins/am-project/ac-parser.y
@@ -206,6 +206,14 @@ definition:
         anjuta_token_merge ($$, $4);
         amp_ac_scanner_update_variable (scanner, $$);
 	}
+	| NAME optional_spaces EQUAL {
+        $$ = anjuta_token_new_static (ANJUTA_TOKEN_DEFINITION, NULL);
+		if ($2) anjuta_token_set_type ($2, ANJUTA_TOKEN_NEXT);
+        anjuta_token_merge ($$, $1);
+        anjuta_token_merge ($$, $2);
+        anjuta_token_merge ($$, $3);
+        amp_ac_scanner_update_variable (scanner, $$);
+	}
 	;
 
 statement:
@@ -247,6 +255,7 @@ value_token:
 
 no_name_token:
     m4_string
+	| shell_string
     | args_token
 	| macro
     | EQUAL
@@ -254,12 +263,11 @@ no_name_token:
     | GREATER
     | VARIABLE
     | WORD
-	| SINGLE_QUOTE
-	| DOUBLE_QUOTE
     ;
 
 no_equal_token:
     m4_string
+	| shell_string
     | args_token
 	| macro
     | LOWER
@@ -267,8 +275,6 @@ no_equal_token:
     | NAME
     | VARIABLE
     | WORD
-	| SINGLE_QUOTE
-	| DOUBLE_QUOTE
     ;
 
 
diff --git a/plugins/am-project/ac-scanner.l b/plugins/am-project/ac-scanner.l
index c07443c..efb0bb0 100644
--- a/plugins/am-project/ac-scanner.l
+++ b/plugins/am-project/ac-scanner.l
@@ -316,7 +316,6 @@ amp_ac_scanner_include (AmpAcScanner *scanner, AnjutaToken *list)
 	filename = g_strstrip (anjuta_token_evaluate (name));
 	//g_message ("read include =%s=", filename);
 	file = g_file_resolve_relative_path (anjuta_token_stream_get_current_directory (scanner->stream), filename);
-	g_message ("file %p current dir %p filename %s", file, anjuta_token_stream_get_current_directory (scanner->stream), filename);
 	g_free (filename);
 	include = anjuta_token_file_new (file);
 	token = anjuta_token_file_load (include, NULL);
diff --git a/plugins/am-project/am-scanner.l b/plugins/am-project/am-scanner.l
index 4a36c94..d285cc1 100644
--- a/plugins/am-project/am-scanner.l
+++ b/plugins/am-project/am-scanner.l
@@ -512,10 +512,7 @@ amp_am_scanner_parse_variable (AmpAmScanner *scanner, AnjutaToken *variable)
 	}
 	g_free (string);
 
-	if (value != NULL)
-	{
-		amp_am_scanner_parse_token (scanner, variable, value, NULL, NULL);
-	}
+	amp_am_scanner_parse_token (scanner, variable, value, NULL, NULL);
 }
 
 void
diff --git a/plugins/am-project/amp-target.c b/plugins/am-project/amp-target.c
index 00a3c67..b3027a6 100644
--- a/plugins/am-project/amp-target.c
+++ b/plugins/am-project/amp-target.c
@@ -50,7 +50,7 @@ struct _AmpTargetNode {
 	AnjutaProjectNode base;
 	gchar *install;
 	gint flags;
-	GList* tokens;	
+	GList* tokens;
 };
 
 
@@ -99,7 +99,7 @@ tagged_token_item_new (AmTokenType type)
 {
     TaggedTokenItem *item;
 
-	item = g_slice_new0(TaggedTokenItem); 
+	item = g_slice_new0(TaggedTokenItem);
 
 	item->type = type;
 
@@ -123,7 +123,7 @@ static GList*
 tagged_token_list_insert (GList *list, AmTokenType type, AnjutaToken *token)
 {
 	GList *existing;
-	
+
 	existing = g_list_find_custom (list, GINT_TO_POINTER (type), tagged_token_item_compare);
 	if (existing == NULL)
 	{
@@ -145,13 +145,13 @@ tagged_token_list_get (GList *list, AmTokenType type)
 {
 	GList *existing;
 	GList *tokens = NULL;
-	
+
 	existing = g_list_find_custom (list, GINT_TO_POINTER (type), tagged_token_item_compare);
 	if (existing != NULL)
 	{
 		tokens = ((TaggedTokenItem *)(existing->data))->tokens;
 	}
-	
+
 	return tokens;
 }
 
@@ -165,7 +165,7 @@ tagged_token_list_get_all (GList *list)
 	{
 		tokens = g_list_concat (tokens, g_list_copy (((TaggedTokenItem *)list->data)->tokens));
 	}
-	
+
 	return tokens;
 }
 
@@ -173,7 +173,7 @@ static AnjutaTokenType
 tagged_token_list_next (GList *list, AmTokenType type)
 {
 	AnjutaTokenType best = 0;
-	
+
 	for (list = g_list_first (list); list != NULL; list = g_list_next (list))
 	{
 		TaggedTokenItem *item = (TaggedTokenItem *)list->data;
@@ -220,8 +220,7 @@ void
 amp_target_node_remove_token (AmpTargetNode *target, AnjutaToken *token)
 {
 	GList *list;
-	
-	g_message ("amp_target_node_remove_token token %p", token);
+
 	for (list = target->tokens; list != NULL; list = g_list_next (list))
 	{
 		TaggedTokenItem *tagged = (TaggedTokenItem *)list->data;
@@ -299,7 +298,7 @@ amp_target_changed (AmpTargetNode *node)
 					{
 						gchar *obj_name;
 						const gchar *obj_ext;
-						
+
 						if (child->name != NULL)
 						{
 							g_free (child->name);
@@ -313,7 +312,7 @@ amp_target_changed (AmpTargetNode *node)
 							gchar *src_name;
 							gchar *src_ext;
 							gchar *new_name;
-							
+
 							src_dir = g_file_get_parent (source->file);
 							src_name = g_file_get_basename (source->file);
 							src_ext = strrchr (src_name, '.');
@@ -339,13 +338,13 @@ AmpTargetNode*
 amp_target_node_new (const gchar *name, AnjutaProjectNodeType type, const gchar *install, gint flags)
 {
 	AmpTargetNode *node;
-	
+
 	node = g_object_new (AMP_TYPE_TARGET_NODE, NULL);
 	amp_target_node_set_type (node, type);
 	node->base.name = g_strdup (name);
 	node->install = g_strdup (install);
 	node->flags = flags;
-	
+
 	return node;
 }
 
@@ -380,8 +379,8 @@ amp_target_node_new_valid (const gchar *name, AnjutaProjectNodeType type, const
 	/* Skip eventual directory name */
 	basename = strrchr (name, '/');
 	basename = basename == NULL ? name : basename + 1;
-		
-	
+
+
 	if ((type & ANJUTA_PROJECT_ID_MASK) == ANJUTA_PROJECT_SHAREDLIB) {
 		if (strlen (basename) < 7 ||
 		    strncmp (basename, "lib", strlen("lib")) != 0 ||
@@ -438,7 +437,7 @@ amp_target_node_erase (AmpNode *target, AmpNode *parent, AmpProject *project, GE
 	token_list = amp_target_node_get_all_token (AMP_TARGET_NODE (target));
 	ok = amp_target_node_delete_token (project, AMP_TARGET_NODE (target), token_list, error);
 	g_list_free (token_list);
-	
+
 	/* Remove installation directory variable if the removed target was the
 	 * only one using it */
 	if (ok)
@@ -519,7 +518,7 @@ amp_target_node_finalize (GObject *object)
 	g_list_foreach (node->base.custom_properties, (GFunc)amp_property_free, NULL);
 	tagged_token_list_free (node->tokens);
 	node->tokens = NULL;
-	
+
 	G_OBJECT_CLASS (amp_target_node_parent_class)->finalize (object);
 }
 
@@ -528,7 +527,7 @@ amp_target_node_class_init (AmpTargetNodeClass *klass)
 {
 	GObjectClass* object_class = G_OBJECT_CLASS (klass);
 	AmpNodeClass* node_class;
-	
+
 	object_class->finalize = amp_target_node_finalize;
 
 	node_class = AMP_NODE_CLASS (klass);
diff --git a/plugins/am-project/tests/anjuta.lst b/plugins/am-project/tests/anjuta.lst
index 9212f20..4400780 100644
--- a/plugins/am-project/tests/anjuta.lst
+++ b/plugins/am-project/tests/anjuta.lst
@@ -45,7 +45,7 @@ PROPERTY (URL): http://www.anjuta.org/
     GROUP (): anjuta
         PROPERTY (Installation directories): anjutadocdir = $(docdir) anjuta_datadir = $(datadir)/anjuta gnomemenudir = $(datadir)/applications
         GROUP (): pixmaps
-            PROPERTY (Installation directories): anjuta_pixmapsdir = $(anjuta_image_dir) anjuta_glade_pixmapsdir = $(anjuta_glade_dir)
+            PROPERTY (Installation directories): anjuta_pixmapsdir = $(datadir)/pixmaps/anjuta anjuta_glade_pixmapsdir = $(datadir)/anjuta/glade
             GROUP (): 16x16
                 PROPERTY (Installation directories): icondir = $(datadir)/icons/hicolor/16x16/apps mimepngicondir = $(datadir)/icons/gnome/16x16/mimetypes
                 TARGET (): icon
@@ -109,12 +109,12 @@ PROPERTY (URL): http://www.anjuta.org/
                 SOURCE (): pixmaps/start-with-import.png
                 SOURCE (): pixmaps/start-with-open.png
         GROUP (): scripts
-            PROPERTY (Installation directories): anjuta_datadir = $(anjuta_data_dir)
+            PROPERTY (Installation directories): anjuta_datadir = $(datadir)/anjuta
             TARGET (): anjuta_data
                 PROPERTY (Installation directory): anjuta_datadir
                 SOURCE (): scripts/anjuta_project.template
         GROUP (): data
-            PROPERTY (Installation directories): anjuta_datadir = $(anjuta_data_dir) anjuta_profiledir = $(anjuta_data_dir)/profiles
+            PROPERTY (Installation directories): anjuta_datadir = $(datadir)/anjuta anjuta_profiledir = $(datadir)/anjuta/profiles
             TARGET (): anjuta_data
                 PROPERTY (Installation directory): anjuta_datadir
                 SOURCE (): data/welcome.txt
@@ -273,16 +273,18 @@ PROPERTY (URL): http://www.anjuta.org/
                     PROPERTY (Installation directory): idldir
                     SOURCE (): libanjuta/interfaces/libanjuta.idl
             GROUP (): tests
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(GDA_CFLAGS) $(LIBANJUTA_CFLAGS)
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(GDA_CFLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
                 TARGET (): anjuta-tabber-test
                     PROPERTY (Do not install): true
-                    PROPERTY (C compiler flags): $(LIBANJUTA_CFLAGS)
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS) $(ANJUTA_LIBS)
+                    PROPERTY (C compiler flags): $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la $(ANJUTA_LIBS)
+                    MODULE (): ANJUTA
                     SOURCE (): libanjuta/tests/anjuta-tabber-test.c
                 TARGET (): anjuta-token-test
                     PROPERTY (Do not install): true
                     PROPERTY (C compiler flags): -g -O0 -fprofile-arcs -ftest-coverage
                     PROPERTY (Libraries): $(ANJUTA_LIBS)
+                    MODULE (): ANJUTA
                     SOURCE (): libanjuta/tests/anjuta-token-test.c
                     SOURCE (): libanjuta/anjuta-token.c
                     SOURCE (): libanjuta/anjuta-debug.c
@@ -462,8 +464,8 @@ PROPERTY (URL): http://www.anjuta.org/
                 SOURCE (): libanjuta/$(INTROSPECTION_GIRS:.gir=.typelib)
         GROUP (): plugins
             GROUP (): am-project
-                PROPERTY (Installation directories): plugin_uidir = $(anjuta_ui_dir) plugin_gladedir = $(anjuta_glade_dir) plugin_pixmapsdir = $(anjuta_image_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(GIO_CFLAGS) $(LIBANJUTA_CFLAGS) -DG_LOG_DOMAIN=\"am-project\"
+                PROPERTY (Installation directories): plugin_uidir = $(datadir)/anjuta/ui plugin_gladedir = $(datadir)/anjuta/glade plugin_pixmapsdir = $(datadir)/pixmaps/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(GIO_CFLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" -DG_LOG_DOMAIN=\"am-project\"
                 PROPERTY (Yacc/Bison flags): -t -v -g -rall -r lookahead,itemset
                 GROUP (): tests
                 TARGET (): plugin_ui
@@ -479,7 +481,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libam-project.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(GIO_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(GIO_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/am-project/plugin.c
                     SOURCE (): plugins/am-project/plugin.h
                     SOURCE (): plugins/am-project/am-project.c
@@ -517,11 +519,12 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/am-project/command-queue.h
                 TARGET (): projectparser
                     PROPERTY (Do not install): true
-                    PROPERTY (Libraries): libam-project.la $(GIO_LIBS) $(LIBANJUTA_LIBS) $(ANJUTA_LIBS)
+                    PROPERTY (Libraries): libam-project.la $(GIO_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la $(ANJUTA_LIBS)
+                    MODULE (): ANJUTA
                     SOURCE (): plugins/am-project/projectparser.c
             GROUP (): build-basic-autotools
-                PROPERTY (Installation directories): build_gladedir = $(anjuta_glade_dir) build_uidir = $(anjuta_ui_dir) build_pixmapsdir = $(anjuta_image_dir) build_plugindir = $(anjuta_plugin_dir) build_datadir = $(anjuta_data_dir)/build plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS)
+                PROPERTY (Installation directories): build_gladedir = $(datadir)/anjuta/glade build_uidir = $(datadir)/anjuta/ui build_pixmapsdir = $(datadir)/pixmaps/anjuta build_plugindir = $(libdir)/anjuta build_datadir = $(datadir)/anjuta/build plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
                 TARGET (): build_glade
                     PROPERTY (Installation directory): build_gladedir
                     SOURCE (): plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
@@ -542,7 +545,7 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/build-basic-autotools/automake-c.filters
                 TARGET (): libanjuta-build-basic-autotools.la
                     PROPERTY (Installation directory): plugindir
-                    PROPERTY (Libraries): $(GIO_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(GIO_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
                     SOURCE (): plugins/build-basic-autotools/plugin.c
                     SOURCE (): plugins/build-basic-autotools/plugin.h
@@ -557,8 +560,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/build-basic-autotools/program.c
                     SOURCE (): plugins/build-basic-autotools/program.h
             GROUP (): class-gen
-                PROPERTY (Installation directories): clsgen_gladedir = $(anjuta_glade_dir) clsgen_pixmapsdir = $(anjuta_image_dir) clsgen_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): -I${top_srcdir} $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS)
+                PROPERTY (Installation directories): clsgen_gladedir = $(datadir)/anjuta/glade clsgen_pixmapsdir = $(datadir)/pixmaps/anjuta clsgen_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): -I${top_srcdir} $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
                 GROUP (): templates
                     PROPERTY (Installation directories): clsgen_appdatadir = "$(datadir)/anjuta/class-templates/"
                     TARGET (): clsgen_appdata
@@ -583,7 +586,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-class-gen.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(GIO_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(GIO_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/class-gen/cell-renderer-flags.h
                     SOURCE (): plugins/class-gen/cell-renderer-flags.c
                     SOURCE (): plugins/class-gen/combo-flags.h
@@ -605,8 +608,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/project-wizard/values.c
                     SOURCE (): plugins/project-wizard/values.h
             GROUP (): code-analyzer
-                PROPERTY (Installation directories): code_analyzer_uidir = $(anjuta_glade_dir) code_analyzer_pixmapsdir = $(anjuta_image_dir) code_analyzer_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS) -DG_LOG_DOMAIN=\"code_analyzer\"
+                PROPERTY (Installation directories): code_analyzer_uidir = $(datadir)/anjuta/glade code_analyzer_pixmapsdir = $(datadir)/pixmaps/anjuta code_analyzer_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" -DG_LOG_DOMAIN=\"code_analyzer\"
                 TARGET (): code_analyzer_ui
                     PROPERTY (Installation directory): code_analyzer_uidir
                     SOURCE (): plugins/code-analyzer/code-analyzer.ui
@@ -619,12 +622,12 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-code-analyzer.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/code-analyzer/plugin.c
                     SOURCE (): plugins/code-analyzer/plugin.h
             GROUP (): cvs-plugin
-                PROPERTY (Installation directories): cvs_plugin_gladedir = $(anjuta_glade_dir) cvs_plugin_pixmapsdir = $(anjuta_image_dir) cvs_plugin_uidir = $(anjuta_ui_dir) cvs_plugin_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS)
+                PROPERTY (Installation directories): cvs_plugin_gladedir = $(datadir)/anjuta/glade cvs_plugin_pixmapsdir = $(datadir)/pixmaps/anjuta cvs_plugin_uidir = $(datadir)/anjuta/ui cvs_plugin_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
                 TARGET (): cvs_plugin_glade
                     PROPERTY (Installation directory): cvs_plugin_gladedir
                     SOURCE (): plugins/cvs-plugin/anjuta-cvs-plugin.ui
@@ -641,7 +644,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-cvs-plugin.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(GIO_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(GIO_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/cvs-plugin/plugin.c
                     SOURCE (): plugins/cvs-plugin/plugin.h
                     SOURCE (): plugins/cvs-plugin/cvs-actions.c
@@ -653,10 +656,10 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/cvs-plugin/cvs-interface.c
                     SOURCE (): plugins/cvs-plugin/cvs-interface.h
             GROUP (): devhelp
-                PROPERTY (Installation directories): devhelp_uidir = $(anjuta_ui_dir) devhelp_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
+                PROPERTY (Installation directories): devhelp_uidir = $(datadir)/anjuta/ui devhelp_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
                 PROPERTY (C preprocessor flags): -DDISABLE_EMBEDDED_DEVHELP
                 GROUP (): images
-                    PROPERTY (Installation directories): devhelp_pixmapsdir = $(anjuta_image_dir)
+                    PROPERTY (Installation directories): devhelp_pixmapsdir = $(datadir)/pixmaps/anjuta
                     TARGET (): devhelp_pixmaps
                         PROPERTY (Installation directory): devhelp_pixmapsdir
                         SOURCE (): plugins/devhelp/images/anjuta-devhelp-plugin.svg
@@ -679,14 +682,14 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-devhelp.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS) $(PLUGIN_DEVHELP_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la $(PLUGIN_DEVHELP_LIBS)
                     SOURCE (): plugins/devhelp/plugin.c
                     SOURCE (): plugins/devhelp/plugin.h
             GROUP (): debug-manager
-                PROPERTY (Installation directories): anjuta_gladedir = $(anjuta_glade_dir) anjuta_uidir = $(anjuta_ui_dir) anjuta_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(GIO_CFLAGS) $(LIBANJUTA_CFLAGS)
+                PROPERTY (Installation directories): anjuta_gladedir = $(datadir)/anjuta/glade anjuta_uidir = $(datadir)/anjuta/ui anjuta_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(GIO_CFLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
                 GROUP (): images
-                    PROPERTY (Installation directories): imagesdir = $(anjuta_image_dir)
+                    PROPERTY (Installation directories): imagesdir = $(datadir)/pixmaps/anjuta
                     TARGET (): images
                         PROPERTY (Installation directory): imagesdir
                         SOURCE (): plugins/debug-manager/images/anjuta-attach-16.png
@@ -731,7 +734,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-debug-manager.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(GIO_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(GIO_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/debug-manager/anjuta-marshal.c
                     SOURCE (): plugins/debug-manager/anjuta-marshal.h
                     SOURCE (): plugins/debug-manager/plugin.c
@@ -781,8 +784,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/debug-manager/variable.c
                     SOURCE (): plugins/debug-manager/variable.h
             GROUP (): dir-project
-                PROPERTY (Installation directories): plugin_uidir = $(anjuta_ui_dir) plugin_gladedir = $(anjuta_glade_dir) plugin_datadir = $(anjuta_data_dir) plugin_pixmapsdir = $(anjuta_image_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(GIO_CFLAGS) $(LIBANJUTA_CFLAGS) -DG_LOG_DOMAIN=\"dir-project\"
+                PROPERTY (Installation directories): plugin_uidir = $(datadir)/anjuta/ui plugin_gladedir = $(datadir)/anjuta/glade plugin_datadir = $(datadir)/anjuta plugin_pixmapsdir = $(datadir)/pixmaps/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(GIO_CFLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" -DG_LOG_DOMAIN=\"dir-project\"
                 TARGET (): plugin_ui
                     PROPERTY (Installation directory): plugin_uidir
                 TARGET (): plugin_glade
@@ -799,7 +802,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libdir-project.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(GIO_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(GIO_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/dir-project/plugin.c
                     SOURCE (): plugins/dir-project/plugin.h
                     SOURCE (): plugins/dir-project/dir-project.c
@@ -807,10 +810,10 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/dir-project/dir-node.c
                     SOURCE (): plugins/dir-project/dir-node.h
             GROUP (): document-manager
-                PROPERTY (Installation directories): document_manager_gladedir = $(anjuta_glade_dir) document_manager_uidir = $(anjuta_ui_dir) document_manager_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(GDL_CFLAGS) $(GIO_CFLAGS) $(XML_CFLAGS) $(LIBANJUTA_CFLAGS) -DG_LOG_DOMAIN=\"libanjuta-document-manager\"
+                PROPERTY (Installation directories): document_manager_gladedir = $(datadir)/anjuta/glade document_manager_uidir = $(datadir)/anjuta/ui document_manager_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(GDL_CFLAGS) $(GIO_CFLAGS) $(XML_CFLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" -DG_LOG_DOMAIN=\"libanjuta-document-manager\"
                 GROUP (): images
-                    PROPERTY (Installation directories): document_manager_pixmapsdir = $(anjuta_image_dir)
+                    PROPERTY (Installation directories): document_manager_pixmapsdir = $(datadir)/pixmaps/anjuta
                     TARGET (): document_manager_pixmaps
                         PROPERTY (Installation directory): document_manager_pixmapsdir
                         SOURCE (): plugins/document-manager/images/anjuta-document-manager-plugin.svg
@@ -868,7 +871,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-document-manager.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(GDL_LIBS) $(GIO_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(GDL_LIBS) $(GIO_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la
                     MODULE (): GDL
                     SOURCE (): plugins/document-manager/plugin.c
                     SOURCE (): plugins/document-manager/plugin.h
@@ -883,8 +886,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/document-manager/anjuta-bookmarks.h
                     SOURCE (): plugins/document-manager/anjuta-bookmarks.c
             GROUP (): file-loader
-                PROPERTY (Installation directories): loader_uidir = $(anjuta_ui_dir) loader_pixmapsdir = $(anjuta_image_dir) loader_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS) -DG_LOG_DOMAIN=\"libanjuta-loader\"
+                PROPERTY (Installation directories): loader_uidir = $(datadir)/anjuta/ui loader_pixmapsdir = $(datadir)/pixmaps/anjuta loader_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" -DG_LOG_DOMAIN=\"libanjuta-loader\"
                 TARGET (): loader_ui
                     PROPERTY (Installation directory): loader_uidir
                     SOURCE (): plugins/file-loader/anjuta-loader-plugin.ui
@@ -898,7 +901,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-loader.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/file-loader/plugin.c
                     SOURCE (): plugins/file-loader/plugin.h
                     SOURCE (): plugins/file-loader/dnd.c
@@ -906,8 +909,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/file-loader/anjuta-recent-chooser-menu.c
                     SOURCE (): plugins/file-loader/anjuta-recent-chooser-menu.h
             GROUP (): file-manager
-                PROPERTY (Installation directories): file_manager_gladedir = $(anjuta_glade_dir) file_manager_uidir = $(anjuta_ui_dir) file_manager_pixmapsdir = $(anjuta_image_dir) file_manager_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(LIBANJUTA_CFLAGS) $(GDL_CFLAGS) $(GIO_CFLAGS)
+                PROPERTY (Installation directories): file_manager_gladedir = $(datadir)/anjuta/glade file_manager_uidir = $(datadir)/anjuta/ui file_manager_pixmapsdir = $(datadir)/pixmaps/anjuta file_manager_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" $(GDL_CFLAGS) $(GIO_CFLAGS)
                 TARGET (): file_manager_glade
                     PROPERTY (Installation directory): file_manager_gladedir
                     SOURCE (): plugins/file-manager/file-manager.ui
@@ -932,7 +935,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libfile-manager.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS) $(GDL_LIBS) $(GIO_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la $(GDL_LIBS) $(GIO_LIBS)
                     MODULE (): GDL
                     SOURCE (): plugins/file-manager/plugin.c
                     SOURCE (): plugins/file-manager/plugin.h
@@ -943,8 +946,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/file-manager/file-model.c
                     SOURCE (): plugins/file-manager/file-model.h
             GROUP (): file-wizard
-                PROPERTY (Installation directories): wizard_gladedir = $(anjuta_glade_dir) wizard_pixmapsdir = $(anjuta_image_dir) wizard_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS)
+                PROPERTY (Installation directories): wizard_gladedir = $(datadir)/anjuta/glade wizard_pixmapsdir = $(datadir)/pixmaps/anjuta wizard_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
                 TARGET (): wizard_glade
                     PROPERTY (Installation directory): wizard_gladedir
                     SOURCE (): plugins/file-wizard/anjuta-file-wizard.ui
@@ -958,16 +961,16 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-file-wizard.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(GIO_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(GIO_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/file-wizard/file.c
                     SOURCE (): plugins/file-wizard/file.h
                     SOURCE (): plugins/file-wizard/plugin.c
                     SOURCE (): plugins/file-wizard/plugin.h
             GROUP (): gdb
-                PROPERTY (Installation directories): gdb_uidir = $(anjuta_ui_dir) anjuta_gladedir = $(anjuta_glade_dir) anjuta_datadir = $(anjuta_data_dir) plugin_pixmapsdir = $(anjuta_image_dir) anjuta_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS) $(XML_CFLAGS)
+                PROPERTY (Installation directories): gdb_uidir = $(datadir)/anjuta/ui anjuta_gladedir = $(datadir)/anjuta/glade anjuta_datadir = $(datadir)/anjuta plugin_pixmapsdir = $(datadir)/pixmaps/anjuta anjuta_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" $(XML_CFLAGS)
                 GROUP (): images
-                    PROPERTY (Installation directories): imagesdir = $(anjuta_image_dir)
+                    PROPERTY (Installation directories): imagesdir = $(datadir)/pixmaps/anjuta
                     TARGET (): images
                         PROPERTY (Installation directory): imagesdir
                         SOURCE (): plugins/gdb/images/breakpoint.png
@@ -991,7 +994,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-gdb.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS) $(XML_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la $(XML_LIBS)
                     MODULE (): XML
                     SOURCE (): plugins/gdb/gdbmi.c
                     SOURCE (): plugins/gdb/gdbmi.h
@@ -1005,18 +1008,19 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/gdb/preferences.h
                 TARGET (): gdbmi-test
                     PROPERTY (Do not install): true
-                    PROPERTY (Libraries): $(GTK_LIBS) $(LIBANJUTA_LIBS) $(XML_LIBS) $(ANJUTA_LIBS)
+                    PROPERTY (Libraries): $(GTK_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la $(XML_LIBS) $(ANJUTA_LIBS)
                     PROPERTY (C compiler flags): $AM_CFLAGS $WARN_CFLAGS
+                    MODULE (): ANJUTA
                     MODULE (): XML
                     SOURCE (): plugins/gdb/gdbmi-test.c
                     SOURCE (): plugins/gdb/gdbmi.c
                     SOURCE (): plugins/gdb/gdbmi.h
                     SOURCE (): plugins/gdb/debugger.h
             GROUP (): git
-                PROPERTY (Installation directories): git_gladedir = $(anjuta_glade_dir) git_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS)
+                PROPERTY (Installation directories): git_gladedir = $(datadir)/anjuta/glade git_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
                 GROUP (): images
-                    PROPERTY (Installation directories): git_pixmapsdir = $(anjuta_image_dir)
+                    PROPERTY (Installation directories): git_pixmapsdir = $(datadir)/pixmaps/anjuta
                     TARGET (): git_pixmaps
                         PROPERTY (Installation directory): git_pixmapsdir
                         SOURCE (): plugins/git/images/anjuta-git-plugin-16.png
@@ -1033,7 +1037,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-git.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/git/plugin.c
                     SOURCE (): plugins/git/plugin.h
                     SOURCE (): plugins/git/git-command.c
@@ -1227,10 +1231,10 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/git/git-apply-mailbox-pane.c
                     SOURCE (): plugins/git/git-apply-mailbox-pane.h
             GROUP (): glade
-                PROPERTY (Installation directories): glade_uidir = $(anjuta_ui_dir) glade_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(PLUGIN_GLADE_CFLAGS) $(LIBANJUTA_CFLAGS)
+                PROPERTY (Installation directories): glade_uidir = $(datadir)/anjuta/ui glade_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(PLUGIN_GLADE_CFLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
                 GROUP (): images
-                    PROPERTY (Installation directories): glade_pixmapsdir = $(anjuta_image_dir)
+                    PROPERTY (Installation directories): glade_pixmapsdir = $(datadir)/pixmaps/anjuta
                     TARGET (): glade_pixmaps
                         PROPERTY (Installation directory): glade_pixmapsdir
                         SOURCE (): plugins/glade/images/anjuta-glade-plugin.svg
@@ -1247,15 +1251,15 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-glade.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(PLUGIN_GLADE_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(PLUGIN_GLADE_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la
                     MODULE (): PLUGIN_GLADE
                     SOURCE (): plugins/glade/plugin.c
                     SOURCE (): plugins/glade/plugin.h
                     SOURCE (): plugins/glade/anjuta-design-document.h
                     SOURCE (): plugins/glade/anjuta-design-document.c
             GROUP (): js-debugger
-                PROPERTY (Installation directories): js_debugger_pixmapsdir = $(anjuta_image_dir) js_debugger_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DANJUTA_DATA_DIR=\"$(anjuta_data_dir)\" -DANJUTA_PLUGIN_DIR=\"$(anjuta_plugin_dir)\" -DANJUTA_IMAGE_DIR=\"$(anjuta_image_dir)\" -DANJUTA_GLADE_DIR=\"$(anjuta_glade_dir)\" -DANJUTA_UI_DIR=\"$(anjuta_ui_dir)\" -DPACKAGE_SRC_DIR=\"$(srcdir)\" $(LIBANJUTA_CFLAGS)
+                PROPERTY (Installation directories): js_debugger_pixmapsdir = $(datadir)/pixmaps/anjuta js_debugger_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DANJUTA_DATA_DIR=\"$(datadir)/anjuta\" -DANJUTA_PLUGIN_DIR=\"$(libdir)/anjuta\" -DANJUTA_IMAGE_DIR=\"$(datadir)/pixmaps/anjuta\" -DANJUTA_GLADE_DIR=\"$(datadir)/anjuta/glade\" -DANJUTA_UI_DIR=\"$(datadir)/anjuta/ui\" -DPACKAGE_SRC_DIR=\"$(srcdir)\" $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
                 TARGET (): js_debugger_pixmaps
                     PROPERTY (Installation directory): js_debugger_pixmapsdir
                     SOURCE (): plugins/js-debugger/js_debugger.png
@@ -1265,7 +1269,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libjs_debugger.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/js-debugger/debugger-js.c
                     SOURCE (): plugins/js-debugger/debugger-js.h
                     SOURCE (): plugins/js-debugger/debugger-server.c
@@ -1273,8 +1277,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/js-debugger/plugin.c
                     SOURCE (): plugins/js-debugger/plugin.h
             GROUP (): language-manager
-                PROPERTY (Installation directories): language_manager_pixmapsdir = $(anjuta_image_dir) language_manager_xmldir = $(anjuta_data_dir) language_manager_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(XML_CFLAGS) $(LIBANJUTA_CFLAGS)
+                PROPERTY (Installation directories): language_manager_pixmapsdir = $(datadir)/pixmaps/anjuta language_manager_xmldir = $(datadir)/anjuta language_manager_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(XML_CFLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
                 TARGET (): language_manager_pixmaps
                     PROPERTY (Installation directory): language_manager_pixmapsdir
                     SOURCE (): plugins/language-manager/anjuta-language-manager-plugin.svg
@@ -1287,19 +1291,19 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/language-manager/$(plugin_in_files:.plugin.in=.plugin)
                 TARGET (): liblanguage-manager.la
                     PROPERTY (Installation directory): plugindir
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS) $(XML_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la $(XML_LIBS)
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
                     MODULE (): XML
                     SOURCE (): plugins/language-manager/plugin.c
                     SOURCE (): plugins/language-manager/plugin.h
             GROUP (): language-support-cpp-java
-                PROPERTY (Installation directories): cpp_java_gladedir = $(anjuta_glade_dir) cpp_java_uidir = $(anjuta_ui_dir) cpp_java_pixmapsdir = $(anjuta_image_dir) cpp_java_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS) $(EXTRA_CFLAGS) -DG_LOG_DOMAIN=\"language-support-cpp-java\"
+                PROPERTY (Installation directories): cpp_java_gladedir = $(datadir)/anjuta/glade cpp_java_uidir = $(datadir)/anjuta/ui cpp_java_pixmapsdir = $(datadir)/pixmaps/anjuta cpp_java_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" $(EXTRA_CFLAGS) -DG_LOG_DOMAIN=\"language-support-cpp-java\"
                 GROUP (): cxxparser
-                    PROPERTY (C preprocessor flags): -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DPACKAGE_SRC_DIR=\""$(srcdir)"\" $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS) $(EXTRA_CFLAGS) -DG_LOG_DOMAIN=\"cxxparser\"
+                    PROPERTY (C preprocessor flags): -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DPACKAGE_SRC_DIR=\""$(srcdir)"\" $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" $(EXTRA_CFLAGS) -DG_LOG_DOMAIN=\"cxxparser\"
                     TARGET (): libcxxparser.la
                         PROPERTY (Do not install): true
-                        PROPERTY (Libraries): $(LIBANJUTA_LIBS) $(GTHREAD_LIBS)
+                        PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la $(GTHREAD_LIBS)
                         PROPERTY (Linker flags): -module -avoid-version -no-undefined
                         SOURCE (): plugins/language-support-cpp-java/cxxparser/expression-lexer.cpp
                         SOURCE (): plugins/language-support-cpp-java/cxxparser/expression-parser.cpp
@@ -1343,7 +1347,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-language-cpp-java.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS) cxxparser/libcxxparser.la
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la cxxparser/libcxxparser.la
                     SOURCE (): plugins/language-support-cpp-java/plugin.c
                     SOURCE (): plugins/language-support-cpp-java/plugin.h
                     SOURCE (): plugins/language-support-cpp-java/cpp-java-assist.h
@@ -1355,8 +1359,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/language-support-cpp-java/cpp-packages.c
                     SOURCE (): plugins/language-support-cpp-java/cpp-packages.h
             GROUP (): language-support-js
-                PROPERTY (Installation directories): js_support_plugin_gladedir = $(anjuta_glade_dir) js_support_plugin_uidir = $(anjuta_ui_dir) js_support_plugin_pixmapsdir = $(anjuta_image_dir) js_support_plugin_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): -I$(top_srcdir)/plugins/symbol-db/anjuta-tags/ $(WARN_CFLAGS) -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DANJUTA_DATA_DIR=\"$(anjuta_data_dir)\" -DANJUTA_PLUGIN_DIR=\"$(anjuta_plugin_dir)\" -DANJUTA_IMAGE_DIR=\"$(anjuta_image_dir)\" -DANJUTA_GLADE_DIR=\"$(anjuta_glade_dir)\" -DANJUTA_UI_DIR=\"$(anjuta_ui_dir)\" $(XML_CFLAGS) $(LIBANJUTA_CFLAGS) -DPACKAGE_SRC_DIR=\"$(srcdir)\" -DGIR_PATH=\"$(INTROSPECTION_GIRDIR)\" -DGJS_PATH=\"$(gjsdir)\" -DG_LOG_DOMAIN=\"language-support-js\"
+                PROPERTY (Installation directories): js_support_plugin_gladedir = $(datadir)/anjuta/glade js_support_plugin_uidir = $(datadir)/anjuta/ui js_support_plugin_pixmapsdir = $(datadir)/pixmaps/anjuta js_support_plugin_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): -I$(top_srcdir)/plugins/symbol-db/anjuta-tags/ $(WARN_CFLAGS) -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DANJUTA_DATA_DIR=\"$(datadir)/anjuta\" -DANJUTA_PLUGIN_DIR=\"$(libdir)/anjuta\" -DANJUTA_IMAGE_DIR=\"$(datadir)/pixmaps/anjuta\" -DANJUTA_GLADE_DIR=\"$(datadir)/anjuta/glade\" -DANJUTA_UI_DIR=\"$(datadir)/anjuta/ui\" $(XML_CFLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" -DPACKAGE_SRC_DIR=\"$(srcdir)\" -DGIR_PATH=\"$(INTROSPECTION_GIRDIR)\" -DGJS_PATH=\"`pkg-config --variable=jsdir gjs-1.0`\" -DG_LOG_DOMAIN=\"language-support-js\"
                 TARGET (): js_support_plugin_glade
                     PROPERTY (Installation directory): js_support_plugin_gladedir
                     SOURCE (): plugins/language-support-js/anjuta-language-javascript.ui
@@ -1372,7 +1376,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libjs-support-plugin.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS) $(XML_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la $(XML_LIBS)
                     MODULE (): XML
                     SOURCE (): plugins/language-support-js/plugin.c
                     SOURCE (): plugins/language-support-js/plugin.h
@@ -1415,8 +1419,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/language-support-js/jstypes.h
                     SOURCE (): plugins/language-support-js/prefs.h
             GROUP (): language-support-python
-                PROPERTY (Installation directories): python_plugin_uidir = $(anjuta_ui_dir) python_plugin_gladedir = $(anjuta_glade_dir) python_plugin_pixmapsdir = $(anjuta_image_dir) scriptsdir = $(anjuta_plugin_dir) python_plugin_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(XML_CFLAGS) $(LIBANJUTA_CFLAGS) -DSCRIPTS_DIR=\" \" -DG_LOG_DOMAIN=\"language-support-python\"
+                PROPERTY (Installation directories): python_plugin_uidir = $(datadir)/anjuta/ui python_plugin_gladedir = $(datadir)/anjuta/glade python_plugin_pixmapsdir = $(datadir)/pixmaps/anjuta scriptsdir = $(libdir)/anjuta python_plugin_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(XML_CFLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" -DSCRIPTS_DIR=\" $(libdir)/anjuta\" -DG_LOG_DOMAIN=\"language-support-python\"
                 TARGET (): python_plugin_ui
                     PROPERTY (Installation directory): python_plugin_uidir
                     SOURCE (): plugins/language-support-python/python-plugin.xml
@@ -1435,7 +1439,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libpython_plugin.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/language-support-python/plugin.c
                     SOURCE (): plugins/language-support-python/plugin.h
                     SOURCE (): plugins/language-support-python/python-assist.c
@@ -1445,8 +1449,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/language-support-python/python-indentation.c
                     SOURCE (): plugins/language-support-python/python-indentation.h
             GROUP (): language-support-vala
-                PROPERTY (Installation directories): vala_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DANJUTA_DATA_DIR=\"$(anjuta_data_dir)\" -DANJUTA_PLUGIN_DIR=\"$(anjuta_plugin_dir)\" -DANJUTA_IMAGE_DIR=\"$(anjuta_image_dir)\" -DANJUTA_GLADE_DIR=\"$(anjuta_glade_dir)\" -DANJUTA_UI_DIR=\"$(anjuta_ui_dir)\" $(LIBANJUTA_CFLAGS) $(VALA_CFLAGS) -DPACKAGE_SRC_DIR=\"$(srcdir)\" -DG_LOG_DOMAIN=\"language-support-vala\" --no-warn
+                PROPERTY (Installation directories): vala_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DANJUTA_DATA_DIR=\"$(datadir)/anjuta\" -DANJUTA_PLUGIN_DIR=\"$(libdir)/anjuta\" -DANJUTA_IMAGE_DIR=\"$(datadir)/pixmaps/anjuta\" -DANJUTA_GLADE_DIR=\"$(datadir)/anjuta/glade\" -DANJUTA_UI_DIR=\"$(datadir)/anjuta/ui\" $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" $(VALA_CFLAGS) -DPACKAGE_SRC_DIR=\"$(srcdir)\" -DG_LOG_DOMAIN=\"language-support-vala\" --no-warn
                 TARGET (): vala_plugin
                     PROPERTY (Installation directory): vala_plugindir
                     SOURCE (): plugins/language-support-vala/$(plugin_in_files:.plugin.in=.plugin)
@@ -1454,15 +1458,15 @@ PROPERTY (URL): http://www.anjuta.org/
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Vala compiler flags): --vapidir $(srcdir) --pkg $(LIBVALA) --pkg libanjuta-3.0
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS) $(VALA_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la $(VALA_LIBS)
                     MODULE (): VALA
                     SOURCE (): plugins/language-support-vala/locator.vala
                     SOURCE (): plugins/language-support-vala/plugin.vala
                     SOURCE (): plugins/language-support-vala/provider.vala
                     SOURCE (): plugins/language-support-vala/report.vala
             GROUP (): message-view
-                PROPERTY (Installation directories): message_view_gladedir = $(anjuta_glade_dir) message_view_pixmapsdir = $(anjuta_image_dir) message_view_uidir = $(anjuta_ui_dir) message_view_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS)
+                PROPERTY (Installation directories): message_view_gladedir = $(datadir)/anjuta/glade message_view_pixmapsdir = $(datadir)/pixmaps/anjuta message_view_uidir = $(datadir)/anjuta/ui message_view_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
                 TARGET (): message_view_glade
                     PROPERTY (Installation directory): message_view_gladedir
                     SOURCE (): plugins/message-view/anjuta-message-manager-plugin.ui
@@ -1483,7 +1487,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-message-view.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(GIO_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(GIO_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/message-view/plugin.c
                     SOURCE (): plugins/message-view/plugin.h
                     SOURCE (): plugins/message-view/anjuta-msgman.c
@@ -1491,8 +1495,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/message-view/message-view.c
                     SOURCE (): plugins/message-view/message-view.h
             GROUP (): mk-project
-                PROPERTY (Installation directories): plugin_uidir = $(anjuta_ui_dir) plugin_gladedir = $(anjuta_glade_dir) plugin_pixmapsdir = $(anjuta_image_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(GIO_CFLAGS) $(XML_CFLAGS) $(LIBANJUTA_CFLAGS) -DG_LOG_DOMAIN=\"mk-project\"
+                PROPERTY (Installation directories): plugin_uidir = $(datadir)/anjuta/ui plugin_gladedir = $(datadir)/anjuta/glade plugin_pixmapsdir = $(datadir)/pixmaps/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(GIO_CFLAGS) $(XML_CFLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" -DG_LOG_DOMAIN=\"mk-project\"
                 PROPERTY (Yacc/Bison flags): -t -v -g -rall
                 TARGET (): plugin_ui
                     PROPERTY (Installation directory): plugin_uidir
@@ -1508,7 +1512,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libmk-project.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(GIO_LIBS) $(LIBANJUTA_LIBS) $(XML_LIBS)
+                    PROPERTY (Libraries): $(GIO_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la $(XML_LIBS)
                     MODULE (): XML
                     SOURCE (): plugins/mk-project/plugin.c
                     SOURCE (): plugins/mk-project/plugin.h
@@ -1521,8 +1525,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/mk-project/mk-rule.h
                     SOURCE (): plugins/mk-project/mk-project-private.h
             GROUP (): patch
-                PROPERTY (Installation directories): patch_uidir = $(anjuta_ui_dir) patch_gladedir = $(anjuta_glade_dir) patch_pixmapsdir = $(anjuta_image_dir) patch_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS)
+                PROPERTY (Installation directories): patch_uidir = $(datadir)/anjuta/ui patch_gladedir = $(datadir)/anjuta/glade patch_pixmapsdir = $(datadir)/pixmaps/anjuta patch_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
                 TARGET (): patch_ui
                     PROPERTY (Installation directory): patch_uidir
                     SOURCE (): plugins/patch/anjuta-patch.xml
@@ -1539,14 +1543,14 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-patch.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/patch/plugin.c
                     SOURCE (): plugins/patch/plugin.h
                     SOURCE (): plugins/patch/patch-plugin.c
                     SOURCE (): plugins/patch/patch-plugin.h
             GROUP (): project-import
-                PROPERTY (Installation directories): wizard_gladedir = $(anjuta_glade_dir) wizard_pixmapsdir = $(anjuta_image_dir) wizard_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(PLUGIN_GNOMEBUILD_CFLAGS) $(LIBANJUTA_CFLAGS)
+                PROPERTY (Installation directories): wizard_gladedir = $(datadir)/anjuta/glade wizard_pixmapsdir = $(datadir)/pixmaps/anjuta wizard_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(PLUGIN_GNOMEBUILD_CFLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
                 TARGET (): wizard_glade
                     PROPERTY (Installation directory): wizard_gladedir
                     SOURCE (): plugins/project-import/project-import.ui
@@ -1560,14 +1564,14 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-project-import.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(PLUGIN_GNOMEBUILD_LIBS) $(GIO_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(PLUGIN_GNOMEBUILD_LIBS) $(GIO_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/project-import/plugin.c
                     SOURCE (): plugins/project-import/plugin.h
                     SOURCE (): plugins/project-import/project-import-dialog.h
                     SOURCE (): plugins/project-import/project-import-dialog.c
             GROUP (): project-manager
-                PROPERTY (Installation directories): project_uidir = $(anjuta_ui_dir) project_gladedir = $(anjuta_glade_dir) project_pixmapsdir = $(anjuta_image_dir) project_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS) -DG_LOG_DOMAIN=\"libanjuta-project-manager\"
+                PROPERTY (Installation directories): project_uidir = $(datadir)/anjuta/ui project_gladedir = $(datadir)/anjuta/glade project_pixmapsdir = $(datadir)/pixmaps/anjuta project_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" -DG_LOG_DOMAIN=\"libanjuta-project-manager\"
                 TARGET (): project_ui
                     PROPERTY (Installation directory): project_uidir
                     SOURCE (): plugins/project-manager/anjuta-project-manager.xml
@@ -1587,7 +1591,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-project-manager.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/project-manager/plugin.c
                     SOURCE (): plugins/project-manager/plugin.h
                     SOURCE (): plugins/project-manager/tree-data.h
@@ -1605,12 +1609,12 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/project-manager/project-marshal.c
                     SOURCE (): plugins/project-manager/project-marshal.h
             GROUP (): project-wizard
-                PROPERTY (Installation directories): wizard_gladedir = $(anjuta_glade_dir) wizard_uidir = $(anjuta_ui_dir) wizard_pixmapsdir = $(anjuta_image_dir) wizard_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS) -DANJUTA_BINDIR=\"$(bindir)\" -DANJUTA_LIBDIR=\"$(libdir)\" -DG_LOG_DOMAIN=\"libanjuta-project-wizard\"
+                PROPERTY (Installation directories): wizard_gladedir = $(datadir)/anjuta/glade wizard_uidir = $(datadir)/anjuta/ui wizard_pixmapsdir = $(datadir)/pixmaps/anjuta wizard_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" -DANJUTA_BINDIR=\"$(bindir)\" -DANJUTA_LIBDIR=\"$(libdir)\" -DG_LOG_DOMAIN=\"libanjuta-project-wizard\"
                 GROUP (): templates
-                    PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project
+                    PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project
                     GROUP (): minimal
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/minimal
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/minimal
                         TARGET (): wizard_files
                             PROPERTY (Installation directory): wizard_filesdir
                             SOURCE (): plugins/project-wizard/templates/minimal/autogen.sh
@@ -1619,15 +1623,15 @@ PROPERTY (URL): http://www.anjuta.org/
                             SOURCE (): plugins/project-wizard/templates/minimal/project.anjuta
                             SOURCE (): plugins/project-wizard/templates/minimal/anjuta.session
                     GROUP (): terminal
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/terminal
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/terminal
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/terminal/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/terminal/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/terminal/src/main.c
                                 SOURCE (): plugins/project-wizard/templates/terminal/src/Makefile.am.tpl
                         GROUP (): po
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/terminal/po
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/terminal/po
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/terminal/po/ChangeLog
@@ -1644,15 +1648,15 @@ PROPERTY (URL): http://www.anjuta.org/
                             SOURCE (): plugins/project-wizard/templates/terminal/project.anjuta
                             SOURCE (): plugins/project-wizard/templates/terminal/README
                     GROUP (): cpp
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/cpp
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/cpp
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/cpp/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/cpp/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/cpp/src/main.cc
                                 SOURCE (): plugins/project-wizard/templates/cpp/src/Makefile.am.tpl
                         GROUP (): po
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/cpp/po
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/cpp/po
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/cpp/po/POTFILES.in
@@ -1661,20 +1665,20 @@ PROPERTY (URL): http://www.anjuta.org/
                             SOURCE (): plugins/project-wizard/templates/cpp/configure.ac.tpl
                     GROUP (): gtk
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/gtk/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/gtk/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/gtk/src/main.c
                                 SOURCE (): plugins/project-wizard/templates/gtk/src/Makefile.am.tpl
                                 SOURCE (): plugins/project-wizard/templates/gtk/src/project.ui
                         GROUP (): po
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/gtk/po
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/gtk/po
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/gtk/po/POTFILES.in
                     GROUP (): gtkapplication
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/gtkapplication/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/gtkapplication/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/gtkapplication/src/main.c
@@ -1683,14 +1687,14 @@ PROPERTY (URL): http://www.anjuta.org/
                                 SOURCE (): plugins/project-wizard/templates/gtkapplication/src/Makefile.am.tpl
                                 SOURCE (): plugins/project-wizard/templates/gtkapplication/src/project.ui
                         GROUP (): po
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/gtkapplication/po
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/gtkapplication/po
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/gtkapplication/po/POTFILES.in
                     GROUP (): anjuta-plugin
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/anjuta-plugin
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/anjuta-plugin
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/anjuta-plugin/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/anjuta-plugin/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/anjuta-plugin/src/Makefile.am.tpl
@@ -1700,7 +1704,7 @@ PROPERTY (URL): http://www.anjuta.org/
                                 SOURCE (): plugins/project-wizard/templates/anjuta-plugin/src/plugin.plugin.in
                                 SOURCE (): plugins/project-wizard/templates/anjuta-plugin/src/plugin.xml
                         GROUP (): po
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/anjuta-plugin/po
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/anjuta-plugin/po
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/anjuta-plugin/po/POTFILES.in
@@ -1708,31 +1712,31 @@ PROPERTY (URL): http://www.anjuta.org/
                             PROPERTY (Installation directory): wizard_filesdir
                             SOURCE (): plugins/project-wizard/templates/anjuta-plugin/configure.ac.tpl
                     GROUP (): gtkmm
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/gtkmm
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/gtkmm
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/gtkmm/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/gtkmm/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/gtkmm/src/main.cc
                                 SOURCE (): plugins/project-wizard/templates/gtkmm/src/Makefile.am.tpl
                                 SOURCE (): plugins/project-wizard/templates/gtkmm/src/project.ui
                         GROUP (): po
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/gtkmm/po
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/gtkmm/po
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/gtkmm/po/POTFILES.in
                         TARGET (): wizard_files
                             PROPERTY (Installation directory): wizard_filesdir
                     GROUP (): wxwin
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/wxwin
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/wxwin
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/wxwin/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/wxwin/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/wxwin/src/main.cc
                                 SOURCE (): plugins/project-wizard/templates/wxwin/src/Makefile.am.tpl
                         GROUP (): po
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/wxwin/po
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/wxwin/po
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/wxwin/po/POTFILES.in
@@ -1740,15 +1744,15 @@ PROPERTY (URL): http://www.anjuta.org/
                             PROPERTY (Installation directory): wizard_filesdir
                             SOURCE (): plugins/project-wizard/templates/wxwin/configure.ac.tpl
                     GROUP (): xlib
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/xlib
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/xlib
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/xlib/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/xlib/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/xlib/src/main.c
                                 SOURCE (): plugins/project-wizard/templates/xlib/src/Makefile.am.tpl
                         GROUP (): po
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/xlib/po
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/xlib/po
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/xlib/po/POTFILES.in
@@ -1757,7 +1761,7 @@ PROPERTY (URL): http://www.anjuta.org/
                             SOURCE (): plugins/project-wizard/templates/xlib/configure.ac.tpl
                     GROUP (): xlib-dock
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/xlib-dock/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/xlib-dock/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/xlib-dock/src/main.c
@@ -1766,14 +1770,14 @@ PROPERTY (URL): http://www.anjuta.org/
                                 SOURCE (): plugins/project-wizard/templates/xlib-dock/src/pixmaps.h
                                 SOURCE (): plugins/project-wizard/templates/xlib-dock/src/Makefile.am.tpl
                         GROUP (): po
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/xlib-dock/po
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/xlib-dock/po
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/xlib-dock/po/POTFILES.in
                     GROUP (): gcj
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/gcj
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/gcj
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/gcj/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/gcj/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/gcj/src/Makefile.am.tpl
@@ -1781,15 +1785,15 @@ PROPERTY (URL): http://www.anjuta.org/
                             PROPERTY (Installation directory): wizard_filesdir
                             SOURCE (): plugins/project-wizard/templates/gcj/configure.ac.tpl
                     GROUP (): java
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/java
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/java
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/java/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/java/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/java/src/main.java
                                 SOURCE (): plugins/project-wizard/templates/java/src/Makefile.am.tpl
                         GROUP (): po
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/java/po
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/java/po
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/java/po/POTFILES.in
@@ -1798,15 +1802,15 @@ PROPERTY (URL): http://www.anjuta.org/
                             SOURCE (): plugins/project-wizard/templates/java/configure.ac.tpl
                             SOURCE (): plugins/project-wizard/templates/java/project.anjuta
                     GROUP (): pygtk
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/pygtk
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/pygtk
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/pygtk/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/pygtk/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/pygtk/src/main.py
                                 SOURCE (): plugins/project-wizard/templates/pygtk/src/Makefile.am.tpl
                         GROUP (): po
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/python/po
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/python/po
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/pygtk/po/POTFILES.in
@@ -1815,15 +1819,15 @@ PROPERTY (URL): http://www.anjuta.org/
                             SOURCE (): plugins/project-wizard/templates/pygtk/configure.ac.tpl
                             SOURCE (): plugins/project-wizard/templates/pygtk/project.anjuta
                     GROUP (): python
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/python
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/python
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/python/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/python/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/python/src/main.py
                                 SOURCE (): plugins/project-wizard/templates/python/src/Makefile.am.tpl
                         GROUP (): po
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/python/po
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/python/po
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/python/po/POTFILES.in
@@ -1832,15 +1836,15 @@ PROPERTY (URL): http://www.anjuta.org/
                             SOURCE (): plugins/project-wizard/templates/python/configure.ac.tpl
                             SOURCE (): plugins/project-wizard/templates/python/project.anjuta
                     GROUP (): mkfile
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/mkfile
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/mkfile
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/mkfile/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/mkfile/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/mkfile/src/Makefile.tpl
                                 SOURCE (): plugins/project-wizard/templates/mkfile/src/main.c
                         GROUP (): po
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/mkfile/po
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/mkfile/po
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/mkfile/po/ChangeLog
@@ -1849,15 +1853,15 @@ PROPERTY (URL): http://www.anjuta.org/
                             PROPERTY (Installation directory): wizard_filesdir
                             SOURCE (): plugins/project-wizard/templates/mkfile/project.anjuta
                     GROUP (): sdl
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/sdl
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/sdl
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/sdl/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/sdl/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/sdl/src/main.c
                                 SOURCE (): plugins/project-wizard/templates/sdl/src/Makefile.am.tpl
                         GROUP (): po
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/sdl/po
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/sdl/po
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/sdl/po/POTFILES.in
@@ -1866,9 +1870,9 @@ PROPERTY (URL): http://www.anjuta.org/
                             SOURCE (): plugins/project-wizard/templates/sdl/configure.ac.tpl
                             SOURCE (): plugins/project-wizard/templates/sdl/acinclude.m4.tpl
                     GROUP (): library
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/library
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/library
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/library/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/library/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/library/src/lib.c
@@ -1876,7 +1880,7 @@ PROPERTY (URL): http://www.anjuta.org/
                                 SOURCE (): plugins/project-wizard/templates/library/src/Makefile.am.tpl
                                 SOURCE (): plugins/project-wizard/templates/library/src/library.pc.in
                         GROUP (): po
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/library/po
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/library/po
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/library/po/POTFILES.in
@@ -1884,12 +1888,12 @@ PROPERTY (URL): http://www.anjuta.org/
                             PROPERTY (Installation directory): wizard_filesdir
                             SOURCE (): plugins/project-wizard/templates/library/configure.ac.tpl
                     GROUP (): directory
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/directory
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/directory
                         TARGET (): wizard_files
                             PROPERTY (Installation directory): wizard_filesdir
                             SOURCE (): plugins/project-wizard/templates/directory/project.anjuta
                     GROUP (): licenses
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/licenses
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/licenses
                         TARGET (): wizard_files
                             PROPERTY (Installation directory): wizard_filesdir
                             SOURCE (): plugins/project-wizard/templates/licenses/BSD
@@ -1897,15 +1901,15 @@ PROPERTY (URL): http://www.anjuta.org/
                             SOURCE (): plugins/project-wizard/templates/licenses/LGPL
                             SOURCE (): plugins/project-wizard/templates/licenses/None
                     GROUP (): m4
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/m4
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/m4
                         TARGET (): wizard_files
                             PROPERTY (Installation directory): wizard_filesdir
                             SOURCE (): plugins/project-wizard/templates/m4/as-ac-expand.m4
                             SOURCE (): plugins/project-wizard/templates/m4/ac-define-dir.m4
                     GROUP (): js_minimal
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/js_minimal
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/js_minimal
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/js_minimal/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/js_minimal/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/js_minimal/src/main.js
@@ -1917,9 +1921,9 @@ PROPERTY (URL): http://www.anjuta.org/
                             SOURCE (): plugins/project-wizard/templates/js_minimal/Makefile.am.tpl
                             SOURCE (): plugins/project-wizard/templates/js_minimal/project.anjuta
                     GROUP (): vala-gtk
-                        PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/vala-gtk
+                        PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/vala-gtk
                         GROUP (): src
-                            PROPERTY (Installation directories): wizard_filesdir = $(anjuta_data_dir)/project/vala-gtk/src
+                            PROPERTY (Installation directories): wizard_filesdir = $(datadir)/anjuta/project/vala-gtk/src
                             TARGET (): wizard_files
                                 PROPERTY (Installation directory): wizard_filesdir
                                 SOURCE (): plugins/project-wizard/templates/vala-gtk/src/main.vala
@@ -1963,7 +1967,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-project-wizard.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/project-wizard/plugin.c
                     SOURCE (): plugins/project-wizard/plugin.h
                     SOURCE (): plugins/project-wizard/druid.c
@@ -1987,20 +1991,20 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/project-wizard/tar.c
                     SOURCE (): plugins/project-wizard/tar.h
             GROUP (): python-loader
-                PROPERTY (Installation directories): plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DANJUTA_DATA_DIR=\"$(anjuta_data_dir)\" -DANJUTA_PLUGIN_DIR=\"$(anjuta_plugin_dir)\" -DANJUTA_IMAGE_DIR=\"$(anjuta_image_dir)\" -DANJUTA_GLADE_DIR=\"$(anjuta_glade_dir)\" -DANJUTA_UI_DIR=\"$(anjuta_ui_dir)\" $(LIBANJUTA_CFLAGS) $(PYTHON_CFLAGS) $(PYGOBJECT_CFLAGS) -DPACKAGE_SRC_DIR=\"$(srcdir)\" -DG_LOG_DOMAIN=\"python-loader\"
+                PROPERTY (Installation directories): plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DANJUTA_DATA_DIR=\"$(datadir)/anjuta\" -DANJUTA_PLUGIN_DIR=\"$(libdir)/anjuta\" -DANJUTA_IMAGE_DIR=\"$(datadir)/pixmaps/anjuta\" -DANJUTA_GLADE_DIR=\"$(datadir)/anjuta/glade\" -DANJUTA_UI_DIR=\"$(datadir)/anjuta/ui\" $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" `$PYTHON-config --cflags` $(PYGOBJECT_CFLAGS) -DPACKAGE_SRC_DIR=\"$(srcdir)\" -DG_LOG_DOMAIN=\"python-loader\"
                 TARGET (): plugin
                     PROPERTY (Installation directory): plugindir
                     SOURCE (): plugins/python-loader/$(plugin_in_files:.plugin.in=.plugin)
                 TARGET (): libanjuta-python-loader.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS) $(PYTHON_LIBS) $(PYGOBJECT_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la `$PYTHON-config --libs` $(PYGOBJECT_LIBS)
                     SOURCE (): plugins/python-loader/plugin.c
                     SOURCE (): plugins/python-loader/plugin.h
             GROUP (): run-program
-                PROPERTY (Installation directories): anjuta_gladedir = $(anjuta_glade_dir) anjuta_uidir = $(anjuta_ui_dir) anjuta_pixmapsdir = $(anjuta_image_dir) anjuta_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS)
+                PROPERTY (Installation directories): anjuta_gladedir = $(datadir)/anjuta/glade anjuta_uidir = $(datadir)/anjuta/ui anjuta_pixmapsdir = $(datadir)/pixmaps/anjuta anjuta_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
                 TARGET (): anjuta_glade
                     PROPERTY (Installation directory): anjuta_gladedir
                     SOURCE (): plugins/run-program/anjuta-run-program.ui
@@ -2016,7 +2020,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-run-program.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/run-program/plugin.c
                     SOURCE (): plugins/run-program/plugin.h
                     SOURCE (): plugins/run-program/parameters.c
@@ -2026,8 +2030,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/run-program/utils.c
                     SOURCE (): plugins/run-program/utils.h
             GROUP (): snippets-manager
-                PROPERTY (Installation directories): snippets_manager_gladedir = $(anjuta_glade_dir) default_snippetsdir = $(anjuta_data_dir) snippets_manager_pixmapsdir = $(anjuta_image_dir) snippets_manager_uidir = $(anjuta_ui_dir) snippets_manager_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(XML_CFLAGS) $(LIBANJUTA_CFLAGS) $(XML_CFLAGS) -DG_LOG_DOMAIN=\"libanjuta-snippets-manager\"
+                PROPERTY (Installation directories): snippets_manager_gladedir = $(datadir)/anjuta/glade default_snippetsdir = $(datadir)/anjuta snippets_manager_pixmapsdir = $(datadir)/pixmaps/anjuta snippets_manager_uidir = $(datadir)/anjuta/ui snippets_manager_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(XML_CFLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" $(XML_CFLAGS) -DG_LOG_DOMAIN=\"libanjuta-snippets-manager\"
                 TARGET (): snippets_manager_glade
                     PROPERTY (Installation directory): snippets_manager_gladedir
                     SOURCE (): plugins/snippets-manager/snippets-manager-preferences.ui
@@ -2049,7 +2053,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-snippets-manager.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(GIO_LIBS) $(LIBANJUTA_LIBS) $(XML_LIBS)
+                    PROPERTY (Libraries): $(GIO_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la $(XML_LIBS)
                     MODULE (): XML
                     SOURCE (): plugins/snippets-manager/snippet.c
                     SOURCE (): plugins/snippets-manager/snippet.h
@@ -2074,8 +2078,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/snippets-manager/snippets-import-export.c
                     SOURCE (): plugins/snippets-manager/snippets-import-export.h
             GROUP (): sourceview
-                PROPERTY (Installation directories): sourceview_xmldir = $(anjuta_glade_dir) sourceview_pixmapsdir = $(anjuta_image_dir) sourceview_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(GIO_CFLAGS) $(SOURCEVIEW_CFLAGS) $(LIBANJUTA_CFLAGS) -DG_LOG_DOMAIN=\"sourceview\"
+                PROPERTY (Installation directories): sourceview_xmldir = $(datadir)/anjuta/glade sourceview_pixmapsdir = $(datadir)/pixmaps/anjuta sourceview_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(GIO_CFLAGS) $(SOURCEVIEW_CFLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" -DG_LOG_DOMAIN=\"sourceview\"
                 TARGET (): sourceview_xml
                     PROPERTY (Installation directory): sourceview_xmldir
                     SOURCE (): plugins/sourceview/anjuta-editor-sourceview.ui
@@ -2094,7 +2098,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-sourceview.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(GIO_LIBS) $(SOURCEVIEW_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(GIO_LIBS) $(SOURCEVIEW_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la
                     MODULE (): SOURCEVIEW
                     SOURCE (): plugins/sourceview/anjuta-marshal.c
                     SOURCE (): plugins/sourceview/anjuta-marshal.h
@@ -2118,8 +2122,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/sourceview/sourceview-provider.h
                     SOURCE (): plugins/sourceview/sourceview-provider.c
             GROUP (): starter
-                PROPERTY (Installation directories): starter_plugindir = $(anjuta_plugin_dir) starter_pixmapsdir = $(anjuta_image_dir) plugindir = $(anjuta_plugin_dir) uidir = $(anjuta_glade_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(GDL_CFLAGS) $(LIBANJUTA_CFLAGS) -DG_LOG_DOMAIN=\"starter\"
+                PROPERTY (Installation directories): starter_plugindir = $(libdir)/anjuta starter_pixmapsdir = $(datadir)/pixmaps/anjuta plugindir = $(libdir)/anjuta uidir = $(datadir)/anjuta/glade
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(GDL_CFLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" -DG_LOG_DOMAIN=\"starter\"
                 TARGET (): starter_plugin
                     PROPERTY (Installation directory): starter_plugindir
                     SOURCE (): plugins/starter/$(plugin_in_files:.plugin.in=.plugin)
@@ -2129,7 +2133,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-starter.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(GDL_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(GDL_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la
                     MODULE (): GDL
                     SOURCE (): plugins/starter/plugin.c
                     SOURCE (): plugins/starter/plugin.h
@@ -2137,8 +2141,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     PROPERTY (Installation directory): uidir
                     SOURCE (): plugins/starter/starter.ui
             GROUP (): subversion
-                PROPERTY (Installation directories): subversion_gladedir = $(anjuta_glade_dir) subversion_pixmapsdir = $(anjuta_image_dir) subversion_uidir = $(anjuta_ui_dir) subversion_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS) $(SVN_CFLAGS) $(SVN_INCLUDE)
+                PROPERTY (Installation directories): subversion_gladedir = $(datadir)/anjuta/glade subversion_pixmapsdir = $(datadir)/pixmaps/anjuta subversion_uidir = $(datadir)/anjuta/ui subversion_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" $APR_CFLAGS $APR_UTILS_CFLAGS $NEON_CFLAGS -I$SVN_INCLUDE
                 TARGET (): subversion_glade
                     PROPERTY (Installation directory): subversion_gladedir
                     SOURCE (): plugins/subversion/anjuta-subversion.ui
@@ -2155,7 +2159,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-subversion.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(GIO_LIBS) $(LIBANJUTA_LIBS) $(SVN_LIB)
+                    PROPERTY (Libraries): $(GIO_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la $APR_LIBS $APR_UTILS_LIBS $NEON_LIBS -lsvn_client-1 -lsvn_subr-1
                     SOURCE (): plugins/subversion/plugin.c
                     SOURCE (): plugins/subversion/plugin.h
                     SOURCE (): plugins/subversion/svn-diff-command.h
@@ -2219,8 +2223,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/subversion/svn-checkout-command.c
                     SOURCE (): plugins/subversion/svn-checkout-command.h
             GROUP (): symbol-db
-                PROPERTY (Installation directories): symbol_db_datadir = $(anjuta_data_dir) symbol_db_uidir = $(anjuta_ui_dir) symbol_db_gladedir = $(anjuta_glade_dir) symbol_db_pixmapsdir = $(anjuta_image_dir) symbol_db_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(GDA_CFLAGS) $(LIBANJUTA_CFLAGS) $(PLUGIN_SYMBOL_DB_CFLAGS) -DSYMBOL_DB_SHM=\"$(SYMBOL_DB_SHM)\" -DPACKAGE_BIN_DIR=\"$(bindir)\" -DG_LOG_DOMAIN=\"libanjuta-symbol-db\"
+                PROPERTY (Installation directories): symbol_db_datadir = $(datadir)/anjuta symbol_db_uidir = $(datadir)/anjuta/ui symbol_db_gladedir = $(datadir)/anjuta/glade symbol_db_pixmapsdir = $(datadir)/pixmaps/anjuta symbol_db_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(GDA_CFLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" $(PLUGIN_SYMBOL_DB_CFLAGS) -DSYMBOL_DB_SHM=\"/dev/shm\" -DPACKAGE_BIN_DIR=\"$(bindir)\" -DG_LOG_DOMAIN=\"libanjuta-symbol-db\"
                 GROUP (): anjuta-tags
                     PROPERTY (C compiler flags): -I$(top_srcdir)/plugins/symbol-db/anjuta-tags/js-parser $(WARN_CFLAGS) $(ANJUTA_CFLAGS) $(VALA_CFLAGS) $(XML_CFLAGS)
                     PROPERTY (C preprocessor flags): -DENABLE_VALA
@@ -2322,7 +2326,7 @@ PROPERTY (URL): http://www.anjuta.org/
                         SOURCE (): plugins/symbol-db/anjuta-tags/vala.c
                         SOURCE (): plugins/symbol-db/anjuta-tags/ctags-visitor.c
                 GROUP (): images
-                    PROPERTY (Installation directories): symbol_browser_iconsdir = $(anjuta_image_dir)
+                    PROPERTY (Installation directories): symbol_browser_iconsdir = $(datadir)/pixmaps/anjuta
                     TARGET (): symbol_browser_icons
                         PROPERTY (Installation directory): symbol_browser_iconsdir
                         SOURCE (): plugins/symbol-db/images/element-literal-16.png
@@ -2349,24 +2353,24 @@ PROPERTY (URL): http://www.anjuta.org/
                         SOURCE (): plugins/symbol-db/images/element-structure-16.png
                 GROUP (): benchmark
                     GROUP (): symbol-db
-                        PROPERTY (C preprocessor flags): $(LIBANJUTA_CFLAGS) $(PLUGIN_SYMBOL_DB_CFLAGS) -DDEBUG
+                        PROPERTY (C preprocessor flags): $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" $(PLUGIN_SYMBOL_DB_CFLAGS) -DDEBUG
                         TARGET (): benchmark
                             PROPERTY (Do not install): true
-                            PROPERTY (Linker flags): $(LIBANJUTA_LIBS) $(ANJUTA_LIBS) $(PLUGIN_SYMBOL_DB_LIBS)
+                            PROPERTY (Linker flags): $(top_builddir)/libanjuta/libanjuta-3.la $(ANJUTA_LIBS) $(PLUGIN_SYMBOL_DB_LIBS)
                             PROPERTY (Libraries): ../../libanjuta-symbol-db.la
                             SOURCE (): plugins/symbol-db/benchmark/symbol-db/benchmark.c
                     GROUP (): libgda
-                        PROPERTY (C preprocessor flags): $(LIBANJUTA_CFLAGS) $(PLUGIN_SYMBOL_DB_CFLAGS) -DDEBUG
+                        PROPERTY (C preprocessor flags): $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" $(PLUGIN_SYMBOL_DB_CFLAGS) -DDEBUG
                         TARGET (): benchmark-libgda
                             PROPERTY (Do not install): true
-                            PROPERTY (Linker flags): $(LIBANJUTA_LIBS) $(ANJUTA_LIBS) $(PLUGIN_SYMBOL_DB_LIBS)
+                            PROPERTY (Linker flags): $(top_builddir)/libanjuta/libanjuta-3.la $(ANJUTA_LIBS) $(PLUGIN_SYMBOL_DB_LIBS)
                             PROPERTY (Libraries): ../../libanjuta-symbol-db.la
                             SOURCE (): plugins/symbol-db/benchmark/libgda/libgda.c
                     GROUP (): sqlite
-                        PROPERTY (C preprocessor flags): $(LIBANJUTA_CFLAGS) $(PLUGIN_SYMBOL_DB_CFLAGS) -DDEBUG
+                        PROPERTY (C preprocessor flags): $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" $(PLUGIN_SYMBOL_DB_CFLAGS) -DDEBUG
                         TARGET (): benchmark-sqlite
                             PROPERTY (Do not install): true
-                            PROPERTY (Linker flags): $(LIBANJUTA_LIBS) $(ANJUTA_LIBS) $(PLUGIN_SYMBOL_DB_LIBS) `pkg-config --libs sqlite3`
+                            PROPERTY (Linker flags): $(top_builddir)/libanjuta/libanjuta-3.la $(ANJUTA_LIBS) $(PLUGIN_SYMBOL_DB_LIBS) `pkg-config --libs sqlite3`
                             SOURCE (): plugins/symbol-db/benchmark/sqlite/sqlite.c
                 TARGET (): symbol_db_data
                     PROPERTY (Installation directory): symbol_db_datadir
@@ -2388,7 +2392,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-symbol-db.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(GDA_LIBS) $(LIBANJUTA_LIBS) $(PLUGIN_SYMBOL_DB_LIBS)
+                    PROPERTY (Libraries): $(GDA_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la $(PLUGIN_SYMBOL_DB_LIBS)
                     MODULE (): GDA
                     MODULE (): GDA
                     MODULE (): PLUGIN_SYMBOL_DB
@@ -2421,8 +2425,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/symbol-db/symbol-db-views.h
                     SOURCE (): plugins/symbol-db/$(BUILT_SOURCES)
             GROUP (): terminal
-                PROPERTY (Installation directories): terminal_gladedir = $(anjuta_glade_dir) terminal_uidir = $(anjuta_ui_dir) terminal_pixmapsdir = $(anjuta_image_dir) terminal_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(VTE_CFLAGS) $(LIBANJUTA_CFLAGS)
+                PROPERTY (Installation directories): terminal_gladedir = $(datadir)/anjuta/glade terminal_uidir = $(datadir)/anjuta/ui terminal_pixmapsdir = $(datadir)/pixmaps/anjuta terminal_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(VTE_CFLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
                 TARGET (): terminal_glade
                     PROPERTY (Installation directory): terminal_gladedir
                     SOURCE (): plugins/terminal/anjuta-terminal-plugin.ui
@@ -2439,14 +2443,14 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-terminal.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(VTE_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(VTE_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la
                     MODULE (): VTE
                     SOURCE (): plugins/terminal/terminal.c
             GROUP (): tools
-                PROPERTY (Installation directories): tools_gladedir = $(anjuta_glade_dir) tools_uidir = $(anjuta_ui_dir) tools_pixmapsdir = $(anjuta_image_dir) tools_plugindir = $(anjuta_plugin_dir) plugindir = $(anjuta_plugin_dir)
-                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(LIBANJUTA_CFLAGS)
+                PROPERTY (Installation directories): tools_gladedir = $(datadir)/anjuta/glade tools_uidir = $(datadir)/anjuta/ui tools_pixmapsdir = $(datadir)/pixmaps/anjuta tools_plugindir = $(libdir)/anjuta plugindir = $(libdir)/anjuta
+                PROPERTY (C preprocessor flags): $(WARN_CFLAGS) $(DEPRECATED_FLAGS) $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
                 GROUP (): scripts
-                    PROPERTY (Installation directories): toolsdir = $(anjuta_data_dir)/tools
+                    PROPERTY (Installation directories): toolsdir = $(datadir)/anjuta/tools
                     TARGET (): tools
                         PROPERTY (Installation directory): toolsdir
                         SOURCE (): plugins/tools/scripts/prepare-changelog.pl
@@ -2469,7 +2473,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 TARGET (): libanjuta-tools.la
                     PROPERTY (Installation directory): plugindir
                     PROPERTY (Linker flags): -module -avoid-version -no-undefined
-                    PROPERTY (Libraries): $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la
                     SOURCE (): plugins/tools/plugin.c
                     SOURCE (): plugins/tools/plugin.h
                     SOURCE (): plugins/tools/dialog.c
@@ -2485,8 +2489,8 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (): plugins/tools/variable.c
                     SOURCE (): plugins/tools/variable.h
         GROUP (): src
-            PROPERTY (Installation directories): anjuta_gladedir = $(anjuta_glade_dir) anjuta_uidir = $(anjuta_ui_dir) anjuta_layoutdir = $(anjuta_data_dir) anjuta_pixmapsdir = $(anjuta_image_dir)
-            PROPERTY (C preprocessor flags): -I$(top_srcdir) -I.. -I. $(LIBANJUTA_CFLAGS) $(SOURCEVIEW_CFLAGS) $(GDL_CFLAGS) $(XML_CFLAGS) -DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_DATA_DIR="\"$(datadir)/$(PACKAGE)\"" -DPACKAGE_DOC_DIR=\"$(docdir)\" -DPACKAGE_PIXMAPS_DIR=\"$(datadir)/pixmaps/$(PACKAGE)\" -DPACKAGE_PLUGIN_DIR=\"$(libdir)/$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\" -DG_LOG_DOMAIN=\"Anjuta\"
+            PROPERTY (Installation directories): anjuta_gladedir = $(datadir)/anjuta/glade anjuta_uidir = $(datadir)/anjuta/ui anjuta_layoutdir = $(datadir)/anjuta anjuta_pixmapsdir = $(datadir)/pixmaps/anjuta
+            PROPERTY (C preprocessor flags): -I$(top_srcdir) -I.. -I. $(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" $(SOURCEVIEW_CFLAGS) $(GDL_CFLAGS) $(XML_CFLAGS) -DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_DATA_DIR="\"$(datadir)/$(PACKAGE)\"" -DPACKAGE_DOC_DIR=\"$(docdir)\" -DPACKAGE_PIXMAPS_DIR=\"$(datadir)/pixmaps/$(PACKAGE)\" -DPACKAGE_PLUGIN_DIR=\"$(libdir)/$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\" -DG_LOG_DOMAIN=\"Anjuta\"
             TARGET (): anjuta_glade
                 PROPERTY (Installation directory): anjuta_gladedir
                 SOURCE (): src/preferences.ui
@@ -2502,8 +2506,9 @@ PROPERTY (URL): http://www.anjuta.org/
                 SOURCE (): src/anjuta-preferences-general-48.png
             TARGET (): anjuta
                 PROPERTY (Installation directory): bindir
-                PROPERTY (Libraries): $(ANJUTA_LIBS) $(SOURCEVIEW_LIBS) $(GDL_LIBS) $(LIBANJUTA_LIBS) $(XML_LIBS)
+                PROPERTY (Libraries): $(ANJUTA_LIBS) $(SOURCEVIEW_LIBS) $(GDL_LIBS) $(top_builddir)/libanjuta/libanjuta-3.la $(XML_LIBS)
                 PROPERTY (Linker flags): -no-undefined
+                MODULE (): ANJUTA
                 MODULE (): XML
                 MODULE (): GDL
                 MODULE (): SOURCEVIEW
@@ -2519,7 +2524,7 @@ PROPERTY (URL): http://www.anjuta.org/
                 SOURCE (): src/main.c
             TARGET (): anjuta-shell
                 PROPERTY (Do not install): true
-                PROPERTY (Libraries): $(LIBANJUTA_LIBS) $(GDL_LIBS)
+                PROPERTY (Libraries): $(top_builddir)/libanjuta/libanjuta-3.la $(GDL_LIBS)
                 MODULE (): GDL
                 SOURCE (): src/shell.c
                 SOURCE (): src/shell.h
diff --git a/plugins/am-project/tests/variable.at b/plugins/am-project/tests/variable.at
index e889162..401e6d7 100644
--- a/plugins/am-project/tests/variable.at
+++ b/plugins/am-project/tests/variable.at
@@ -48,10 +48,11 @@ AT_CHECK([diff -b output expect])
 AS_MKDIR_P([variable_ac3])
 AT_DATA([variable_ac3/configure.ac],
 [[
-TARGET_LDFLAGS='-no-undefined'
+TARGET_LDFLAGS="$plugin-$plugin"
 AC_SUBST(TARGET_LDFLAGS)
 TARGET_CFLAGS="-O0"
 AC_SUBST(TARGET_CFLAGS)
+NO_VALUE=
 AC_CONFIG_FILES(Makefile)
 ]])
 AT_DATA([variable_ac3/Makefile.am],
@@ -64,7 +65,7 @@ AT_DATA([expect],
 [[    GROUP (): variable_ac3
         TARGET (): target1
             PROPERTY (Installation directory): bindir
-            PROPERTY (Linker flags): -no-undefined
+            PROPERTY (Linker flags): $plugin-$plugin
             PROPERTY (C compiler flags): -O0
 ]])
 AT_PARSER_CHECK([load variable_ac3 \



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