[Gnucash-changes] r12839 - gnucash/trunk - Fix the build so Chris' command-line processing works.

[Derek Atkins]

Author: warlord
Date: 2006-01-18 10:49:17 -0500 (Wed, 18 Jan 2006)
New Revision: 12839
Trac: http://svn.gnucash.org/trac/changeset/12839

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/Makefile.am
   gnucash/trunk/src/bin/Makefile.am
Log:
Fix the build so Chris' command-line processing works.

	* src/bin/Makefile.am:  Fix some srcdir/builddir issues
	  with #includes and libraries.
	* src/Makefile.am:  Move 'bin' last so that it's built
	  after gnome-utils so Chris' change works.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-01-18 03:46:53 UTC (rev 12838)
+++ gnucash/trunk/ChangeLog	2006-01-18 15:49:17 UTC (rev 12839)
@@ -1,3 +1,10 @@
+2006-01-18  Derek Atkins  <derek at ihtfp.com>
+
+	* src/bin/Makefile.am:  Fix some srcdir/builddir issues
+	  with #includes and libraries.
+	* src/Makefile.am:  Move 'bin' last so that it's built
+	  after gnome-utils so Chris' change works.
+
 2006-01-17  Christian Stimming  <stimming at tuhh.de>
 
 	* src/import-export/mt940/gnc-mt940-import.c: Add initial work on

Modified: gnucash/trunk/src/Makefile.am
===================================================================
--- gnucash/trunk/src/Makefile.am	2006-01-18 03:46:53 UTC (rev 12838)
+++ gnucash/trunk/src/Makefile.am	2006-01-18 15:49:17 UTC (rev 12839)
@@ -7,8 +7,7 @@
   engine \
   backend \
   scm \
-  quotes \
-  bin
+  quotes
 
 GUI_SUBDIRS_1 = \
   network-utils \
@@ -23,7 +22,8 @@
   gnome \
   import-export \
   business \
-  optional 
+  optional \
+  bin
 
 DIST_SUBDIRS = $(NONGUI_SUBDIRS) $(GUI_SUBDIRS_1) report $(GUI_SUBDIRS_2)
 

Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am	2006-01-18 03:46:53 UTC (rev 12838)
+++ gnucash/trunk/src/bin/Makefile.am	2006-01-18 15:49:17 UTC (rev 12839)
@@ -2,14 +2,15 @@
 SUBDIRS = . overrides test
 
 AM_CFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
+-I${top_srcdir}/src/gnome-utils \
 -I${top_builddir}/src/gnome-utils \
--I${top_builddir}/src/gnc-module
+-I${top_srcdir}/src/gnc-module
 
 bin_PROGRAMS = gnucash-bin
 gnucash_bin_SOURCES = gnucash-bin.c
 gnucash_bin_LDADD = ${GUILE_LIBS} ${GLIB_LIBS} ${GNOME_LIBS} ${GTK_LIBS} \
-${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
-${top_srcdir}/src/gnc-module/libgncmodule.la
+${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
+${top_builddir}/src/gnc-module/libgncmodule.la
 
 gnucash: gnucash.in ${top_builddir}/config.status Makefile
 	rm -f $@.tmp