Revision: 3463 http://geany.svn.sourceforge.net/geany/?rev=3463&view=rev Author: eht16 Date: 2009-01-12 00:33:29 +0000 (Mon, 12 Jan 2009)
Log Message: ----------- Fix build without GIO again (sorry). Remove trailing slashes in Makefile.am's (patch by Daniel Richard G., thanks).
Modified Paths: -------------- trunk/ChangeLog trunk/plugins/Makefile.am trunk/src/Makefile.am trunk/src/utils.c trunk/tagmanager/include/Makefile.am
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-11 21:24:09 UTC (rev 3462) +++ trunk/ChangeLog 2009-01-12 00:33:29 UTC (rev 3463) @@ -20,6 +20,11 @@ Don't fold toplevel PHP script tags (part of #2003912). Replace remaining occurences of sptr_t by uptr_t in the third argument of SSM() calls. + * plugins/Makefile.am, src/Makefile.am, src/utils.c, + tagmanager/include/Makefile.am: + Fix build without GIO again (sorry). + Remove trailing slashes in Makefile.am's + (patch by Daniel Richard G., thanks).
2009-01-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/plugins/Makefile.am =================================================================== --- trunk/plugins/Makefile.am 2009-01-11 21:24:09 UTC (rev 3462) +++ trunk/plugins/Makefile.am 2009-01-12 00:33:29 UTC (rev 3463) @@ -8,7 +8,7 @@
plugindir = $(libdir)/geany
-plugins_includedir = $(includedir)/geany/ +plugins_includedir = $(includedir)/geany plugins_include_HEADERS = \ pluginmacros.h \ geanyfunctions.h
Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2009-01-11 21:24:09 UTC (rev 3462) +++ trunk/src/Makefile.am 2009-01-12 00:33:29 UTC (rev 3463) @@ -49,7 +49,7 @@ utils.c utils.h
-geany_includedir = $(includedir)/geany/ +geany_includedir = $(includedir)/geany geany_include_HEADERS = \ dialogs.h \ document.h \
Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2009-01-11 21:24:09 UTC (rev 3462) +++ trunk/src/utils.c 2009-01-12 00:33:29 UTC (rev 3463) @@ -43,8 +43,11 @@ #endif
#include <glib/gstdio.h> -#include <gio/gio.h>
+#ifdef HAVE_GIO +# include <gio/gio.h> +#endif + #include "prefs.h" #include "support.h" #include "document.h"
Modified: trunk/tagmanager/include/Makefile.am =================================================================== --- trunk/tagmanager/include/Makefile.am 2009-01-11 21:24:09 UTC (rev 3462) +++ trunk/tagmanager/include/Makefile.am 2009-01-12 00:33:29 UTC (rev 3463) @@ -1,7 +1,7 @@ noinst_HEADERS = \ gnuregex.h
-tagmanager_includedir = $(includedir)/geany/tagmanager/ +tagmanager_includedir = $(includedir)/geany/tagmanager tagmanager_include_HEADERS = \ tm_project.h \ tm_source_file.h \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.