anjuta r4139 - in trunk: . plugins/build-basic-autotools plugins/git plugins/scratchbox

[jhs svn gnome org]

Author: jhs
Date: Fri Aug 15 09:38:56 2008
New Revision: 4139
URL: http://svn.gnome.org/viewvc/anjuta?rev=4139&view=rev

Log:
2008-08-15  Johannes Schmid  <jhs gnome org>

	Patch by Koop Mast <kwm freebsd org>

	* plugins/build-basic-autotools/plugin.c (on_build_mesg_format):
	* plugins/scratchbox/Makefile.am:
	* plugins/git/git-command.h:
	* plugins/git/Makefile.am:
	#546620 â Build- and make dist fixes
	(with some small changes)

Modified:
   trunk/ChangeLog
   trunk/plugins/build-basic-autotools/plugin.c
   trunk/plugins/git/Makefile.am
   trunk/plugins/git/git-command.h
   trunk/plugins/scratchbox/Makefile.am

Modified: trunk/plugins/build-basic-autotools/plugin.c
==============================================================================
--- trunk/plugins/build-basic-autotools/plugin.c	(original)
+++ trunk/plugins/build-basic-autotools/plugin.c	Fri Aug 15 09:38:56 2008
@@ -47,6 +47,9 @@
 #include "program.h"
 
 #include <sys/wait.h>
+#if defined(__FreeBSD__)
+#include <sys/signal.h>
+#endif
 
 #define ICON_FILE "anjuta-build-basic-autotools-plugin-48.png"
 #define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-build-basic-autotools-plugin.ui"
@@ -827,10 +830,6 @@
 		g_free (mid_str);
 		g_free (dummy_fn);
 	}
-	else if (strstr (line, ": ") != NULL)
-	{
-		type = IANJUTA_MESSAGE_VIEW_TYPE_INFO;
-	}
 	
 	node = patterns_list;
 	while (node)

Modified: trunk/plugins/git/Makefile.am
==============================================================================
--- trunk/plugins/git/Makefile.am	(original)
+++ trunk/plugins/git/Makefile.am	Fri Aug 15 09:38:56 2008
@@ -184,4 +184,5 @@
 	$(plugin_in_files) \
 	$(git_plugin_DATA) \
 	$(git_ui_DATA) \
+	$(git_glade_DATA) \
 	$(git_pixmaps_DATA)

Modified: trunk/plugins/git/git-command.h
==============================================================================
--- trunk/plugins/git/git-command.h	(original)
+++ trunk/plugins/git/git-command.h	Fri Aug 15 09:38:56 2008
@@ -27,7 +27,7 @@
 
 #include <glib-object.h>
 #include <string.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <libanjuta/anjuta-sync-command.h>

Modified: trunk/plugins/scratchbox/Makefile.am
==============================================================================
--- trunk/plugins/scratchbox/Makefile.am	(original)
+++ trunk/plugins/scratchbox/Makefile.am	Fri Aug 15 09:38:56 2008
@@ -35,6 +35,7 @@
 # Plugin sources
 libanjuta_scratchbox_la_SOURCES = \
 	plugin.c
+	plugin.h
 
 EXTRA_DIST = \
 	$(plugin_in_files) \