r15745 - gnucash/trunk - Remove almost unused configure output variables.

[Andreas Köhler]

Author: andi5
Date: 2007-03-21 16:03:47 -0400 (Wed, 21 Mar 2007)
New Revision: 15745
Trac: http://svn.gnucash.org/trac/changeset/15745

Modified:
   gnucash/trunk/configure.in
   gnucash/trunk/src/engine/Makefile.am
Log:
Remove almost unused configure output variables.

GNUCASH_{APP_UTILS,GNOME_UTILS,REGISTER_CORE}_{CFLAGS,LIBS} and
GNC_FALSE have been completely unused.  GNUCASH_ENGINE_{,BASE}_* could be
moved to its only user engine/Makefile.am.


Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2007-03-21 09:46:01 UTC (rev 15744)
+++ gnucash/trunk/configure.in	2007-03-21 20:03:47 UTC (rev 15745)
@@ -209,6 +209,9 @@
 fi
 AM_CONDITIONAL(BUILDING_FROM_SVN, test "x$BUILDING_FROM_SVN" = "xyes")
 
+# Build dir adjustments
+AM_CONDITIONAL(GNUCASH_SEPARATE_BUILDDIR, test "x${srcdir}" != "x.")
+
 # These are unavailable on windows/mingw32
 AC_CHECK_HEADERS(X11/Xlib.h glob.h)
 AC_CHECK_FUNCS(chown gethostname getppid getuid gettimeofday gmtime_r)
@@ -1287,41 +1290,6 @@
 fi
 AC_SUBST(LC_MESSAGES_ENUM)
 
-### --------------------------------------------------------------------------
-### GnuCash flags and libs configuration
-
-GNUCASH_ENGINE_BASE_LIBS="${GLIB_LIBS}"
-GNUCASH_ENGINE_LIBS="-L${pkglibdir} ${GNUCASH_ENGINE_BASE_LIBS} ${GUILE_LIBS} -lgncmod-engine -lgnc-module"
-
-GNUCASH_ENGINE_BASE_CFLAGS="-DGNUCASH ${GLIB_CFLAGS} ${GUILE_INCS}"
-GNUCASH_ENGINE_CFLAGS="${GNUCASH_ENGINE_BASE_CFLAGS}"
-
-AC_SUBST(GNUCASH_ENGINE_BASE_LIBS)
-AC_SUBST(GNUCASH_ENGINE_LIBS)
-AC_SUBST(GNUCASH_ENGINE_BASE_CFLAGS)
-AC_SUBST(GNUCASH_ENGINE_CFLAGS)
-
-GNUCASH_APP_UTILS_CFLAGS="${GNUCASH_ENGINE_CFLAGS}"
-GNUCASH_APP_UTILS_LIBS="${GNUCASH_ENGINE_LIBS} -lgncmod-calculation -lgncmod-app-utils"
-
-AC_SUBST(GNUCASH_APP_UTILS_CFLAGS)
-AC_SUBST(GNUCASH_APP_UTILS_LIBS)
-
-GNUCASH_GNOME_UTILS_CFLAGS="${GNUCASH_APP_UTILS_CFLAGS} ${GNOME_PRINT_CFLAGS} ${GNOME_INCLUDEDIR} ${GDK_PIXBUF_CFLAGS}"
-GNUCASH_GNOME_UTILS_LIBS="${GNUCASH_APP_UTILS_LIBS} ${GNOME_LIBDIR} ${GNOMEUI_LIBS} ${GNOME_PRINT_LIBS} ${GTKHTML_LIBS} ${GLADE_LIBS} ${GDK_PIXBUF_LIBS} -lgncmod-gnome-utils"
-
-AC_SUBST(GNUCASH_GNOME_UTILS_CFLAGS)
-AC_SUBST(GNUCASH_GNOME_UTILS_LIBS)
-
-GNUCASH_REGISTER_CORE_CFLAGS="${GNUCASH_GNOME_UTILS_CFLAGS}"
-GNUCASH_REGISTER_CORE_LIBS="${GNUCASH_GNOME_UTILS_LIBS} -lgncmod-register-core"
-
-AC_SUBST(GNUCASH_REGISTER_CORE_CFLAGS)
-AC_SUBST(GNUCASH_REGISTER_CORE_LIBS)
-
-AM_CONDITIONAL(GNUCASH_SEPARATE_BUILDDIR, test "x${srcdir}" != "x.")
-AM_CONDITIONAL(GNC_FALSE, false)
-
 ###-------------------------------------------------------------------------
 ### Additional compiler warnings (or not) if we're running GCC
 ###-------------------------------------------------------------------------

Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am	2007-03-21 09:46:01 UTC (rev 15744)
+++ gnucash/trunk/src/engine/Makefile.am	2007-03-21 20:03:47 UTC (rev 15745)
@@ -9,7 +9,8 @@
 	-I${top_builddir}/src \
 	-I${top_srcdir}/src/gnc-module \
 	${QOF_CFLAGS} \
-	${GNUCASH_ENGINE_CFLAGS}
+	${GLIB_CFLAGS} \
+	${GUILE_INCS}
 
 libgncmod_engine_la_SOURCES = \
   Account.c \
@@ -115,7 +116,7 @@
   ${GUILE_LIBS} \
   ${QOF_LIBS} \
   ${REGEX_LIBS} \
-  ${GNUCASH_ENGINE_BASE_LIBS} \
+  ${GLIB_LIBS} \
   ${BINRELOC_LIBS} \
   ${top_builddir}/lib/libc/libc-missing.la