Follow-up to r19928: Include gnc-version.h with directory path to avo…

…id picking the wrong file. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19952 57a11ea4-9604-0410-9ed3-97b8803252fd
Gnucash · Dec 16, 2010 · 300284f · 300284f
1 parent c94ee4d
commit 300284f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
@@ -15,7 +15,7 @@ AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
   -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 @@ dist_noinst_DATA = gnucash.rc
 
 .rc.res:
 	$(AM_V_GEN)$(RC) -i '$<' --input-format=rc -o '$@' -O coff
-	
+
 configdir = ${GNC_CONFIGDIR}
 config_DATA = environment
 

diff --git a/src/bin/gnucash-bin.c b/src/bin/gnucash-bin.c
@@ -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"

diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am
@@ -48,6 +48,7 @@ AM_CPPFLAGS = \
   ${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

diff --git a/src/core-utils/gnc-main.c b/src/core-utils/gnc-main.c
@@ -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;

diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
@@ -12,7 +12,6 @@ AM_CPPFLAGS = \
   -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} \

diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c
@@ -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"

diff --git a/src/gnome-utils/gnc-splash.c b/src/gnome-utils/gnc-splash.c
@@ -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>"