anjuta r3618 - in trunk: . plugins/build-basic-autotools plugins/cvs-plugin plugins/document-manager plugins/editor plugins/indent plugins/language-support-cpp-java plugins/message-view plugins/sourceview plugins/symbol-browser plugins/terminal scripts src

[jhs svn gnome org]

Author: jhs
Date: Sun Feb 10 10:07:43 2008
New Revision: 3618
URL: http://svn.gnome.org/viewvc/anjuta?rev=3618&view=rev

Log:
2008-02-10  Johannes Schmid <jhs gnome org>

  Patch from RÃmi Cardona <remi gentoo org>

	* plugins/build-basic-autotools/Makefile.am:
	* plugins/cvs-plugin/Makefile.am:
	* plugins/document-manager/Makefile.am:
	* plugins/editor/Makefile.am:
	* plugins/indent/Makefile.am:
	* plugins/language-support-cpp-java/Makefile.am:
	* plugins/message-view/Makefile.am:
	* plugins/sourceview/Makefile.am:
	* plugins/symbol-browser/Makefile.am:
	* plugins/terminal/Makefile.am:
	* scripts/build-schemas.mk:
	* src/Makefile.am:
  Fix #512531 â Parallel build fails
  
  * AUTHORS: Added RÃmi

Modified:
   trunk/AUTHORS
   trunk/ChangeLog
   trunk/plugins/build-basic-autotools/Makefile.am
   trunk/plugins/cvs-plugin/Makefile.am
   trunk/plugins/document-manager/Makefile.am
   trunk/plugins/editor/Makefile.am
   trunk/plugins/indent/Makefile.am
   trunk/plugins/language-support-cpp-java/Makefile.am
   trunk/plugins/message-view/Makefile.am
   trunk/plugins/sourceview/Makefile.am
   trunk/plugins/symbol-browser/Makefile.am
   trunk/plugins/terminal/Makefile.am
   trunk/scripts/build-schemas.mk
   trunk/src/Makefile.am

Modified: trunk/AUTHORS
==============================================================================
--- trunk/AUTHORS	(original)
+++ trunk/AUTHORS	Sun Feb 10 10:07:43 2008
@@ -4,7 +4,7 @@
 	
 Present Developers:
 -------------------------------------------------------------------------------
-	Johannes Schmid  <clubfan users sourceforge net> (Germany)
+	Johannes Schmid  <jhs gnome org> (Germany)
 	Sebastien Granjoux  <seb sfo free fr> (France)
 	
 Past Developers:
@@ -91,6 +91,7 @@
 	Philip Van Hoof  <pvanhoof gnome org>
 	Pierre Sarrazin <sarrazip sympatico ca>
 	RafaÅ Bursig  <bursig poczta fm>
+	RÃmi Cardona  <remi gentoo org>
 	Rick Patel  <rikul bellsouth net>
 	Rob Bradford  <robster debian org>
 	Rodrigo Moya <rodrigo novell com>

Modified: trunk/plugins/build-basic-autotools/Makefile.am
==============================================================================
--- trunk/plugins/build-basic-autotools/Makefile.am	(original)
+++ trunk/plugins/build-basic-autotools/Makefile.am	Sun Feb 10 10:07:43 2008
@@ -56,9 +56,6 @@
 prefs_glade_files = anjuta-build-basic-autotools-plugin.glade
 include $(top_srcdir)/scripts/build-schemas.mk
 
-libanjuta_build_basic_autotools_la_DEPENDENCIES = \
-	build-schema-files 
-
 EXTRA_DIST = \
 	$(plugin_in_files) \
 	$(build_plugin_DATA) \

Modified: trunk/plugins/cvs-plugin/Makefile.am
==============================================================================
--- trunk/plugins/cvs-plugin/Makefile.am	(original)
+++ trunk/plugins/cvs-plugin/Makefile.am	Sun Feb 10 10:07:43 2008
@@ -47,9 +47,6 @@
 prefs_glade_files = anjuta-cvs-plugin.glade
 include $(top_srcdir)/scripts/build-schemas.mk
 
-libanjuta_cvs_plugin_la_DEPENDENCIES = \
-	build-schema-files
-
 EXTRA_DIST = \
 	$(plugin_in_files) \
 	$(cvs_plugin_pixmaps_DATA) \

Modified: trunk/plugins/document-manager/Makefile.am
==============================================================================
--- trunk/plugins/document-manager/Makefile.am	(original)
+++ trunk/plugins/document-manager/Makefile.am	Sun Feb 10 10:07:43 2008
@@ -54,9 +54,6 @@
 prefs_glade_files = anjuta-document-manager.glade
 include $(top_srcdir)/scripts/build-schemas.mk
 
-libanjuta_document_manager_la_DEPENDENCIES = \
-	build-schema-files 
-
 EXTRA_DIST = \
 	$(document_manager_pixmaps_DATA) \
 	$(plugin_in_files) \

Modified: trunk/plugins/editor/Makefile.am
==============================================================================
--- trunk/plugins/editor/Makefile.am	(original)
+++ trunk/plugins/editor/Makefile.am	Sun Feb 10 10:07:43 2008
@@ -76,9 +76,6 @@
 prefs_glade_files = anjuta-editor-scintilla.glade
 include $(top_srcdir)/scripts/build-schemas.mk
 
-libanjuta_editor_la_DEPENDENCIES = \
-	build-schema-files
-
 endif
 
 EXTRA_DIST = \

Modified: trunk/plugins/indent/Makefile.am
==============================================================================
--- trunk/plugins/indent/Makefile.am	(original)
+++ trunk/plugins/indent/Makefile.am	Sun Feb 10 10:07:43 2008
@@ -62,9 +62,6 @@
 prefs_glade_files = indent.glade
 include $(top_srcdir)/scripts/build-schemas.mk
 
-libanjuta_indent_la_DEPENDENCIES = \
-	build-schema-files 
-
 EXTRA_DIST = \
 	$(plugin_in_files) \
 	$(indent_plugin_DATA) \

Modified: trunk/plugins/language-support-cpp-java/Makefile.am
==============================================================================
--- trunk/plugins/language-support-cpp-java/Makefile.am	(original)
+++ trunk/plugins/language-support-cpp-java/Makefile.am	Sun Feb 10 10:07:43 2008
@@ -64,10 +64,6 @@
 prefs_glade_files = anjuta-language-cpp-java.glade
 include $(top_srcdir)/scripts/build-schemas.mk
 
-libanjuta_language_cpp_java_la_DEPENDENCIES = \
-	build-schema-files
-
-
 EXTRA_DIST = \
 	$(plugin_in_files) \
 	$(cpp_java_plugin_DATA) \

Modified: trunk/plugins/message-view/Makefile.am
==============================================================================
--- trunk/plugins/message-view/Makefile.am	(original)
+++ trunk/plugins/message-view/Makefile.am	Sun Feb 10 10:07:43 2008
@@ -46,9 +46,6 @@
 prefs_glade_files = anjuta-message-manager-plugin.glade
 include $(top_srcdir)/scripts/build-schemas.mk
 
-libanjuta_message_view_la_DEPENDENCIES = \
-	build-schema-files
-
 EXTRA_DIST = \
 	$(plugin_in_files) \
 	$(message_view_pixmaps_DATA) \

Modified: trunk/plugins/sourceview/Makefile.am
==============================================================================
--- trunk/plugins/sourceview/Makefile.am	(original)
+++ trunk/plugins/sourceview/Makefile.am	Sun Feb 10 10:07:43 2008
@@ -97,9 +97,6 @@
 prefs_glade_files = anjuta-editor-sourceview.glade
 include $(top_srcdir)/scripts/build-schemas.mk
 
-libanjuta_sourceview_la_DEPENDENCIES = \
-	build-schema-files
-
 endif
 
 EXTRA_DIST = \

Modified: trunk/plugins/symbol-browser/Makefile.am
==============================================================================
--- trunk/plugins/symbol-browser/Makefile.am	(original)
+++ trunk/plugins/symbol-browser/Makefile.am	Sun Feb 10 10:07:43 2008
@@ -68,9 +68,6 @@
 prefs_glade_files = anjuta-symbol-browser-plugin.glade
 include $(top_srcdir)/scripts/build-schemas.mk
 
-libanjuta_symbol_browser_la_DEPENDENCIES = \
-	build-schema-files
-
 EXTRA_DIST = \
 	$(plugin_in_files) \
 	$(symbol_browser_plugin_DATA) \

Modified: trunk/plugins/terminal/Makefile.am
==============================================================================
--- trunk/plugins/terminal/Makefile.am	(original)
+++ trunk/plugins/terminal/Makefile.am	Sun Feb 10 10:07:43 2008
@@ -43,9 +43,6 @@
 prefs_glade_files = anjuta-terminal-plugin.glade
 include $(top_srcdir)/scripts/build-schemas.mk
 
-libanjuta_terminal_la_DEPENDENCIES = \
-	build-schema-files
-
 EXTRA_DIST = \
 	$(plugin_in_files) \
 	$(terminal_plugin_DATA) \

Modified: trunk/scripts/build-schemas.mk
==============================================================================
--- trunk/scripts/build-schemas.mk	(original)
+++ trunk/scripts/build-schemas.mk	Sun Feb 10 10:07:43 2008
@@ -3,11 +3,9 @@
 prefs_glade_schemasdir = @GCONF_SCHEMA_FILE_DIR@
 prefs_glade_schemas_DATA = $(prefs_glade_files:.glade=.schemas)
 
-build-schema-files:
-	for p in $(prefs_glade_files); do \
-		$(top_srcdir)/scripts/glade2schema.pl $(srcdir)/$$p > `basename $$p .glade`.schemas; \
-	done
-	
+%.schemas: %.glade
+	$(top_srcdir)/scripts/glade2schema.pl $(srcdir)/$(?) > $(@)
+
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	        for p in $(prefs_glade_schemas) ; do \

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Feb 10 10:07:43 2008
@@ -55,9 +55,6 @@
 prefs_glade_files = anjuta.glade
 include $(top_srcdir)/scripts/build-schemas.mk
 
-anjuta_DEPENDENCIES = \
-	build-schema-files
-
 anjuta_shell_SOURCES = shell.c shell.h
 anjuta_shell_LDADD =  \
 	$(top_builddir)/libanjuta/libanjuta.la