patches from jeremy

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@1402 57a11ea4-9604-0410-9ed3-97b8803252fd

src/gnome/MainWindow.c

@@ -32,6 +32,7 @@
 
 /** GLOBALS **********************************************************/
 main_window    *mwindow;
+char		*HELP_ROOT = "";
 
 gchar *clist_titles[] =
 {

src/gnome/Makefile.in

@@ -24,7 +24,11 @@
 
 include @top_srcdir@/Makefile.init
 
-INCLPATH = -I.. -I../.. -I../engine -I../register -I../guile \
+INCLPATH = -I.. \
+           -I../.. \
+           -I../engine \
+           -I../register \
+           -I../swig \
            -I@srcdir@/../../include \
            -I$(includedir)
 
@@ -42,7 +46,7 @@ TARGET   = ../../gnucash.gnome
 STATIC   = ../../gnucash.gnome.static
 
 OTHER_OBJS := ../obj/gnome/*.o ../engine/obj/*.o ../register/obj/gnome/*.o \
-              ../guile/obj/*.o ../swig/guile/gnucash-guile_wrap.o
+              ../guile/obj/*.o ../swig/guile/gnucash-all-guile_wrap.o
 
 ######################################################################
 # See Makefile.common for information about these variables.

src/gnome/RegWindow.c

@@ -40,7 +40,7 @@
 #include "Account.h"
 #include "AccountP.h"  /* hack alert -- do not include P.h files !! */
 #include "Group.h"
-#include "Ledger.h"
+#include "MultiLedger.h"
 #include "LedgerUtils.h"
 #include "MainWindow.h"
 #include "main.h"

src/gnome/main.c

@@ -269,7 +269,7 @@ gnucash_lowlev_app_init()
   int fake_argc = 1;
   char *fake_argv[] = {"gnucash"};
 
-  gnome_init("GnuCash", NULL, fake_argc, fake_argv, 0, NULL);  
+  gnome_init("GnuCash", NULL, fake_argc, fake_argv);  
   prepare_app(); 
 
   {