r19952 - gnucash/trunk/src - Follow-up to r19928: Include gnc-version.h with directory path to avoid picking the wrong file.

Christian Stimming cstim at code.gnucash.org
Thu Dec 16 17:01:48 EST 2010


Author: cstim
Date: 2010-12-16 17:01:48 -0500 (Thu, 16 Dec 2010)
New Revision: 19952
Trac: http://svn.gnucash.org/trac/changeset/19952

Modified:
   gnucash/trunk/src/bin/Makefile.am
   gnucash/trunk/src/bin/gnucash-bin.c
   gnucash/trunk/src/core-utils/Makefile.am
   gnucash/trunk/src/core-utils/gnc-main.c
   gnucash/trunk/src/gnome-utils/Makefile.am
   gnucash/trunk/src/gnome-utils/gnc-main-window.c
   gnucash/trunk/src/gnome-utils/gnc-splash.c
Log:
Follow-up to r19928: Include gnc-version.h with directory path to avoid picking the wrong file.

Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am	2010-12-16 21:43:21 UTC (rev 19951)
+++ gnucash/trunk/src/bin/Makefile.am	2010-12-16 22:01:48 UTC (rev 19952)
@@ -15,7 +15,7 @@
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnome \
-  -I${top_builddir}/src/core-utils \
+  -I${top_builddir}/src \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \
@@ -31,7 +31,7 @@
 
 .rc.res:
 	$(AM_V_GEN)$(RC) -i '$<' --input-format=rc -o '$@' -O coff
-	
+
 configdir = ${GNC_CONFIGDIR}
 config_DATA = environment
 

Modified: gnucash/trunk/src/bin/gnucash-bin.c
===================================================================
--- gnucash/trunk/src/bin/gnucash-bin.c	2010-12-16 21:43:21 UTC (rev 19951)
+++ gnucash/trunk/src/bin/gnucash-bin.c	2010-12-16 22:01:48 UTC (rev 19952)
@@ -33,7 +33,7 @@
 #include "gnc-module.h"
 #include "gnc-path.h"
 #include "binreloc.h"
-#include "gnc-version.h"
+#include "core-utils/gnc-version.h"
 #include "gnc-engine.h"
 #include "gnc-filepath-utils.h"
 #include "gnc-ui-util.h"

Modified: gnucash/trunk/src/core-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/Makefile.am	2010-12-16 21:43:21 UTC (rev 19951)
+++ gnucash/trunk/src/core-utils/Makefile.am	2010-12-16 22:01:48 UTC (rev 19952)
@@ -48,6 +48,7 @@
   ${IGE_MAC_CFLAGS} \
   ${QOF_CFLAGS} \
   -I${top_srcdir}/src/libqof/qof \
+  -I${top_builddir}/src \
   -I${top_srcdir}/src
 
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash

Modified: gnucash/trunk/src/core-utils/gnc-main.c
===================================================================
--- gnucash/trunk/src/core-utils/gnc-main.c	2010-12-16 21:43:21 UTC (rev 19951)
+++ gnucash/trunk/src/core-utils/gnc-main.c	2010-12-16 22:01:48 UTC (rev 19952)
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include "config.h"
 #include "gnc-main.h"
-#include "gnc-version.h"
+#include "core-utils/gnc-version.h"
 
 static gchar *namespace_regexp = NULL;
 static gboolean is_debugging = 0;

Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am	2010-12-16 21:43:21 UTC (rev 19951)
+++ gnucash/trunk/src/gnome-utils/Makefile.am	2010-12-16 22:01:48 UTC (rev 19952)
@@ -12,7 +12,6 @@
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src \
   -I${top_builddir}/src \
-  -I${top_builddir}/src/core-utils \
   -I${top_srcdir}/lib/libc \
   -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \

Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c	2010-12-16 21:43:21 UTC (rev 19951)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c	2010-12-16 22:01:48 UTC (rev 19952)
@@ -60,7 +60,7 @@
 #include "gnc-ui.h"
 #include "gnc-ui-util.h"
 #include "gnc-uri-utils.h"
-#include "gnc-version.h"
+#include "core-utils/gnc-version.h"
 #include "gnc-window.h"
 #include "gnc-main.h"
 #include "gnc-gconf-utils.h"

Modified: gnucash/trunk/src/gnome-utils/gnc-splash.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-splash.c	2010-12-16 21:43:21 UTC (rev 19951)
+++ gnucash/trunk/src/gnome-utils/gnc-splash.c	2010-12-16 22:01:48 UTC (rev 19952)
@@ -27,7 +27,7 @@
 
 #include "gnc-gnome-utils.h"
 #include "gnc-splash.h"
-#include "gnc-version.h"
+#include "core-utils/gnc-version.h"
 #include "gnc-gconf-utils.h"
 
 #define MARKUP_STRING "<span size='small'>%s</span>"



More information about the gnucash-changes mailing list