From 5bc3898c4db3ca9e5b0d4e83bb9acc4d61b3a87d Mon Sep 17 00:00:00 2001 From: Derek Atkins Date: Wed, 18 Jan 2006 15:49:17 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12839 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 7 +++++++ src/Makefile.am | 6 +++--- src/bin/Makefile.am | 7 ++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index be73924fc4..be2e1552f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-01-18 Derek Atkins + + * 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 * src/import-export/mt940/gnc-mt940-import.c: Add initial work on diff --git a/src/Makefile.am b/src/Makefile.am index 2dc06add07..090504bf2c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,8 +7,7 @@ NONGUI_SUBDIRS = \ engine \ backend \ scm \ - quotes \ - bin + quotes GUI_SUBDIRS_1 = \ network-utils \ @@ -23,7 +22,8 @@ GUI_SUBDIRS_2 = \ gnome \ import-export \ business \ - optional + optional \ + bin DIST_SUBDIRS = $(NONGUI_SUBDIRS) $(GUI_SUBDIRS_1) report $(GUI_SUBDIRS_2) diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index fd869b13d5..7676aa9cd9 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -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