r15321 - gnucash/trunk - Unify library names and installation directories.

Andreas Köhler andi5 at cvs.gnucash.org
Sun Jan 7 02:04:43 EST 2007


Author: andi5
Date: 2007-01-07 02:04:23 -0500 (Sun, 07 Jan 2007)
New Revision: 15321
Trac: http://svn.gnucash.org/trac/changeset/15321

Modified:
   gnucash/trunk/configure.in
   gnucash/trunk/lib/libqof/backend/file/Makefile.am
   gnucash/trunk/lib/libqof/qof/Makefile.am
   gnucash/trunk/src/app-utils/Makefile.am
   gnucash/trunk/src/app-utils/test/Makefile.am
   gnucash/trunk/src/backend/file/Makefile.am
   gnucash/trunk/src/backend/file/test/Makefile.am
   gnucash/trunk/src/backend/postgres/test/Makefile.am
   gnucash/trunk/src/bin/Makefile.am
   gnucash/trunk/src/business/business-core/Makefile.am
   gnucash/trunk/src/business/business-core/file/Makefile.am
   gnucash/trunk/src/business/business-core/test/Makefile.am
   gnucash/trunk/src/business/business-gnome/Makefile.am
   gnucash/trunk/src/business/business-ledger/Makefile.am
   gnucash/trunk/src/business/business-utils/Makefile.am
   gnucash/trunk/src/business/dialog-tax-table/Makefile.am
   gnucash/trunk/src/core-utils/Makefile.am
   gnucash/trunk/src/core-utils/core-utils.scm
   gnucash/trunk/src/engine/Makefile.am
   gnucash/trunk/src/engine/gnc-engine.c
   gnucash/trunk/src/engine/test-core/Makefile.am
   gnucash/trunk/src/engine/test/Makefile.am
   gnucash/trunk/src/gnc-module/Makefile.am
   gnucash/trunk/src/gnc-module/gnc-module.scm
   gnucash/trunk/src/gnc-module/test/Makefile.am
   gnucash/trunk/src/gnc-module/test/misc-mods/Makefile.am
   gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
   gnucash/trunk/src/gnc-module/test/test-dynload.c
   gnucash/trunk/src/gnc-module/test/test-scm-dynload
   gnucash/trunk/src/gnome-search/Makefile.am
   gnucash/trunk/src/gnome-utils/Makefile.am
   gnucash/trunk/src/gnome-utils/test/Makefile.am
   gnucash/trunk/src/gnome/Makefile.am
   gnucash/trunk/src/import-export/Makefile.am
   gnucash/trunk/src/import-export/binary-import/Makefile.am
   gnucash/trunk/src/import-export/hbci/Makefile.am
   gnucash/trunk/src/import-export/log-replay/Makefile.am
   gnucash/trunk/src/import-export/ofx/Makefile.am
   gnucash/trunk/src/import-export/qif-import/Makefile.am
   gnucash/trunk/src/import-export/qif-import/qif-import.scm
   gnucash/trunk/src/import-export/qif-import/test/Makefile.am
   gnucash/trunk/src/import-export/qif-io-core/test/Makefile.am
   gnucash/trunk/src/import-export/qif/test/Makefile.am
   gnucash/trunk/src/import-export/test/Makefile.am
   gnucash/trunk/src/network-utils/Makefile.am
   gnucash/trunk/src/register/ledger-core/Makefile.am
   gnucash/trunk/src/register/register-core/Makefile.am
   gnucash/trunk/src/register/register-gnome/Makefile.am
   gnucash/trunk/src/report/locale-specific/us/Makefile.am
   gnucash/trunk/src/report/report-gnome/Makefile.am
   gnucash/trunk/src/report/report-system/Makefile.am
   gnucash/trunk/src/report/standard-reports/Makefile.am
   gnucash/trunk/src/report/stylesheets/Makefile.am
   gnucash/trunk/src/report/utility-reports/Makefile.am
   gnucash/trunk/src/test-core/Makefile.am
Log:
Unify library names and installation directories.

Rename libcore-utils        to libgnc-core-utils
Rename libgncgnome          to libgnc-gnome
Rename libgncmodule         to libgnc-module
Rename libgncqof            to libgnc-qof
Rename libgnc-backend-file  to libgncmod-backend-file
Move libgnc-business-ledger to $prefix/lib
Move libgncqof-backend-qsf  to $prefix/lib/gnucash
Move libgncmod-backend-file to $prefix/lib/gnucash


Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/configure.in	2007-01-07 07:04:23 UTC (rev 15321)
@@ -506,9 +506,9 @@
   AC_MSG_NOTICE([External QOF Disabled.  Using Internal QOF Code.])
 fi
 if test x$QOF_XML_DIR = x; then
-	QOF_LIB_DIR='${libdir}'
+	QOF_LIB_DIR='${pkglibdir}'
 	QOF_CFLAGS='-I${top_builddir}/lib/libqof/qof -I${top_srcdir}/lib/libqof/qof'
-	QOF_LIBS='${top_builddir}/lib/libqof/qof/libgncqof.la'
+	QOF_LIBS='${top_builddir}/lib/libqof/qof/libgnc-qof.la'
 	QOF_VERSION="internal"
 	QOF_PREFIX="internal"
 	QOF_XML_DIR='${pkgdatadir}/xml/qsf'
@@ -1946,7 +1946,7 @@
 ### GnuCash flags and libs configuration
 
 GNUCASH_ENGINE_BASE_LIBS="${GLIB_LIBS}"
-GNUCASH_ENGINE_LIBS="-L${GNC_MODULE_DIR} ${GNUCASH_ENGINE_BASE_LIBS} ${GUILE_LIBS} -lgncmod-engine -lgncmodule"
+GNUCASH_ENGINE_LIBS="-L${GNC_MODULE_DIR} ${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}"

Modified: gnucash/trunk/lib/libqof/backend/file/Makefile.am
===================================================================
--- gnucash/trunk/lib/libqof/backend/file/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/lib/libqof/backend/file/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -1,6 +1,6 @@
 SUBDIRS = . 
 
-lib_LTLIBRARIES = libgncqof-backend-qsf.la
+pkglib_LTLIBRARIES = libgncqof-backend-qsf.la
 
 AM_CFLAGS = \
   -I.. -I../.. \

Modified: gnucash/trunk/lib/libqof/qof/Makefile.am
===================================================================
--- gnucash/trunk/lib/libqof/qof/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/lib/libqof/qof/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -1,7 +1,7 @@
-lib_LTLIBRARIES = libgncqof.la
+lib_LTLIBRARIES = libgnc-qof.la
 
-libgncqof_la_LDFLAGS= -version-info $(LIBQOF_LIBRARY_VERSION)
-libgncqof_la_LIBADD= \
+libgnc_qof_la_LDFLAGS= -version-info $(LIBQOF_LIBRARY_VERSION)
+libgnc_qof_la_LIBADD= \
   $(GLIB_LIBS) \
   $(REGEX_LIBS) \
   $(top_builddir)/lib/libc/libc-missing.la
@@ -10,7 +10,7 @@
   $(GLIB_CFLAGS) \
   -I$(top_srcdir)/lib/libc
 
-libgncqof_la_SOURCES =  \
+libgnc_qof_la_SOURCES =  \
    deprecated.c      \
    gnc-date.c        \
    gnc-numeric.c     \
@@ -99,6 +99,6 @@
 # run "make check" (to build the test program) and then run test-qofmath
 check_PROGRAMS = test-qofmath
 test_qofmath_SOURCES=gnc-numeric.c
-test_qofmath_CPPFLAGS=$(libgncqof_la_CPPFLAGS) -DTEST_128_BIT_MULT
-test_qofmath_LDFLAGS=$(libgncqof_la_LDFLAGS)
-test_qofmath_LDADD=$(libgncqof_la_LIBADD)
+test_qofmath_CPPFLAGS=$(libgnc_qof_la_CPPFLAGS) -DTEST_128_BIT_MULT
+test_qofmath_LDFLAGS=$(libgnc_qof_la_LDFLAGS)
+test_qofmath_LDADD=$(libgnc_qof_la_LIBADD)

Modified: gnucash/trunk/src/app-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/app-utils/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -65,10 +65,10 @@
   option-util.h
 
 libgncmod_app_utils_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/calculation/libgncmod-calculation.la \
-  ${top_builddir}/src/core-utils/libcore-utils.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
   ${GCONF_LIBS} \
   ${GTK_LIBS} \
   ${GUILE_LIBS} \

Modified: gnucash/trunk/src/app-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/test/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/app-utils/test/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -34,11 +34,11 @@
 
 LDADD = \
    ${top_builddir}/src/engine/libgncmod-engine.la \
-   ${top_builddir}/src/gnc-module/libgncmodule.la \
+   ${top_builddir}/src/gnc-module/libgnc-module.la \
    ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
    ${top_builddir}/src/test-core/libgncmod-test.la \
    ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
-   ${top_builddir}/src/core-utils/libcore-utils.la \
+   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
    ${GUILE_LIBS} \
    ${QOF_LIBS} \
    ${GCONF_LIBS}

Modified: gnucash/trunk/src/backend/file/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/file/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/backend/file/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -1,7 +1,8 @@
 SUBDIRS = . test
 
 # Now a shared library AND a GModule
-lib_LTLIBRARIES = libgnc-backend-file-utils.la  libgnc-backend-file.la
+lib_LTLIBRARIES = libgnc-backend-file-utils.la
+pkglib_LTLIBRARIES = libgncmod-backend-file.la
 
 AM_CFLAGS = \
   -I.. -I../.. \
@@ -38,7 +39,7 @@
   sixtp-utils.c \
   sixtp.c
 
-libgnc_backend_file_la_SOURCES = \
+libgncmod_backend_file_la_SOURCES = \
   gnc-backend-file.c
 
 noinst_HEADERS = \
@@ -60,13 +61,13 @@
 libgnc_backend_file_utils_la_LIBADD = \
    ${GLIB_LIBS} ${GCONF_LIBS} ${LIBXML2_LIBS} \
    ${top_builddir}/src/engine/libgncmod-engine.la \
-   ${top_builddir}/src/core-utils/libcore-utils.la \
+   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
    ${QOF_LIBS}
 
-libgnc_backend_file_la_LDFLAGS = -module -avoid-version
-libgnc_backend_file_la_LIBADD = \
+libgncmod_backend_file_la_LDFLAGS = -module -avoid-version
+libgncmod_backend_file_la_LIBADD = \
    ${GLIB_LIBS} ${GCONF_LIBS} ${LIBXML2_LIBS} \
    ${top_builddir}/src/engine/libgncmod-engine.la \
-   ${top_builddir}/src/core-utils/libcore-utils.la \
+   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
    libgnc-backend-file-utils.la \
    ${QOF_LIBS}

Modified: gnucash/trunk/src/backend/file/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/file/test/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/backend/file/test/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -215,10 +215,10 @@
 noinst_HEADERS = test-file-stuff.h
 
 LDADD = ${top_builddir}/src/test-core/libgncmod-test.la \
-        ${top_builddir}/src/gnc-module/libgncmodule.la \
+        ${top_builddir}/src/gnc-module/libgnc-module.la \
         ${top_builddir}/src/engine/libgncmod-engine.la \
         ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
-        ${top_builddir}/src/core-utils/libcore-utils.la \
+        ${top_builddir}/src/core-utils/libgnc-core-utils.la \
         ./libgnc-test-file-stuff.la \
         ${LIBXML2_LIBS} \
         ${QOF_LIBS} \

Modified: gnucash/trunk/src/backend/postgres/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/postgres/test/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/backend/postgres/test/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -21,7 +21,7 @@
   test-period
 
 LDADD = ${top_builddir}/src/test-core/libgncmod-test.la \
-        ${top_builddir}/src/gnc-module/libgncmodule.la \
+        ${top_builddir}/src/gnc-module/libgnc-module.la \
         ${top_builddir}/src/engine/libgncmod-engine.la \
         ${top_builddir}/src/engine/libgncmod-engine.la \
         ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \

Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/bin/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -22,11 +22,11 @@
 gnucash_bin_LDADD = ${GUILE_LIBS} ${GLIB_LIBS} ${GNOME_LIBS} ${GTK_LIBS} \
 ${QOF_LIBS} \
 ${top_builddir}/src/engine/libgncmod-engine.la \
-${top_builddir}/src/gnome/libgncgnome.la \
+${top_builddir}/src/gnome/libgnc-gnome.la \
 ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
 ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-${top_builddir}/src/core-utils/libcore-utils.la \
-${top_builddir}/src/gnc-module/libgncmodule.la
+${top_builddir}/src/core-utils/libgnc-core-utils.la \
+${top_builddir}/src/gnc-module/libgnc-module.la
 
 gnucash: gnucash.in ${top_builddir}/config.status Makefile
 	rm -f $@.tmp

Modified: gnucash/trunk/src/business/business-core/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/business/business-core/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -56,7 +56,7 @@
   gncVendorP.h
 
 libgncmod_business_core_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${QOF_LIBS} \
   ${GUILE_LIBS} \

Modified: gnucash/trunk/src/business/business-core/file/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/file/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/business/business-core/file/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -47,7 +47,7 @@
   ${top_builddir}/src/business/business-core/libgncmod-business-core.la \
   ${top_builddir}/src/backend/file/libgnc-backend-file-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${LIBXML2_LIBS} \
   ${QOF_LIBS} \
   ${GLIB_LIBS}

Modified: gnucash/trunk/src/business/business-core/test/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/test/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/business/business-core/test/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -10,7 +10,7 @@
   ${GLIB_CFLAGS} 
 
 LDADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/test-core/libgncmod-test.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ../libgncmod-business-core.la \

Modified: gnucash/trunk/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/business/business-gnome/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -76,8 +76,8 @@
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libcore-utils.la \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${GLADE_LIBS} \
   ${GNOME_LIBS} \
   ${GUILE_LIBS} \

Modified: gnucash/trunk/src/business/business-ledger/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-ledger/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/business/business-ledger/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -1,6 +1,6 @@
 SUBDIRS = .
 
-pkglib_LTLIBRARIES = libgnc-business-ledger.la
+lib_LTLIBRARIES = libgnc-business-ledger.la
 
 libgnc_business_ledger_la_SOURCES = \
   gncEntryLedger.c \
@@ -26,7 +26,7 @@
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libcore-utils.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
   ${GTK_LIBS} \
   ${GUILE_LIBS} \
   ${QOF_LIBS} \

Modified: gnucash/trunk/src/business/business-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-utils/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/business/business-utils/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -20,7 +20,7 @@
   business-options.h
 
 libgncmod_business_utils_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS} \

Modified: gnucash/trunk/src/business/dialog-tax-table/Makefile.am
===================================================================
--- gnucash/trunk/src/business/dialog-tax-table/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/business/dialog-tax-table/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -30,7 +30,7 @@
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${GLADE_LIBS} \
   ${GUILE_LIBS} \
   ${GNOME_LIBS} \

Modified: gnucash/trunk/src/core-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/core-utils/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -1,6 +1,6 @@
-lib_LTLIBRARIES = libcore-utils.la
+lib_LTLIBRARIES = libgnc-core-utils.la
 
-libcore_utils_la_SOURCES = \
+libgnc_core_utils_la_SOURCES = \
   gnc-main.c \
   gnc-gconf-utils.c \
   gnc-gdate-utils.c \
@@ -10,7 +10,7 @@
   swig-core-utils.c \
   gnc-gtk-utils.c
 
-libcore_utils_la_LIBADD = \
+libgnc_core_utils_la_LIBADD = \
   ${GUILE_LIBS} \
   ${GLIB_LIBS} \
   ${GCONF_LIBS} \

Modified: gnucash/trunk/src/core-utils/core-utils.scm
===================================================================
--- gnucash/trunk/src/core-utils/core-utils.scm	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/core-utils/core-utils.scm	2007-01-07 07:04:23 UTC (rev 15321)
@@ -6,7 +6,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (gnucash core-utils))
-(load-extension "libcore-utils" "scm_init_sw_core_utils_module")
+(load-extension "libgnc-core-utils" "scm_init_sw_core_utils_module")
 (use-modules (sw_core_utils))
 
 (re-export gnc-is-debugging)

Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/engine/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -113,8 +113,8 @@
 noinst_SCRIPTS = iso-currencies-to-c
 
 libgncmod_engine_la_LIBADD = \
-  ../gnc-module/libgncmodule.la \
-  ../core-utils/libcore-utils.la \
+  ../gnc-module/libgnc-module.la \
+  ../core-utils/libgnc-core-utils.la \
   ${GUILE_LIBS} \
   ${QOF_LIBS} \
   ${REGEX_LIBS} \

Modified: gnucash/trunk/src/engine/gnc-engine.c
===================================================================
--- gnucash/trunk/src/engine/gnc-engine.c	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/engine/gnc-engine.c	2007-01-07 07:04:23 UTC (rev 15321)
@@ -39,7 +39,7 @@
 #include "gnc-pricedb-p.h"
 
 /** gnc file backend library name */
-#define GNC_LIB_NAME "gnc-backend-file"
+#define GNC_LIB_NAME "gncmod-backend-file"
 
 /* gnc-backend-file location */
 #include "gnc-path.h"
@@ -86,7 +86,7 @@
   gnc_engine_init_hook_t hook;
   GList * cur;
   gchar *tracefilename;
-  gchar *libdir;
+  gchar *pkglibdir;
 
   if (1 == engine_is_initialized) return;
 
@@ -107,16 +107,16 @@
   /* Now register our core types */
   cashobjects_register();
 
-  libdir = gnc_path_get_libdir ();
+  pkglibdir = gnc_path_get_pkglibdir ();
   for (lib = libs; lib->lib ; lib++)
   {
-      if (qof_load_backend_library(libdir, lib->lib))
+      if (qof_load_backend_library(pkglibdir, lib->lib))
       {
           engine_is_initialized = 1;
       }
       else
       {
-	  g_message("failed to load %s from %s\n", lib->lib, libdir);
+	  g_message("failed to load %s from %s\n", lib->lib, pkglibdir);
 	  /* If this is a required library, stop now! */
 	  if (lib->required)
 	  {
@@ -124,7 +124,7 @@
 	  }
       }
   }
-  g_free (libdir);
+  g_free (pkglibdir);
 
   /* call any engine hooks */
   for (cur = engine_init_hooks; cur; cur = cur->next)

Modified: gnucash/trunk/src/engine/test/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/test/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/engine/test/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -11,11 +11,11 @@
   ${GLIB_CFLAGS}
 
 LDADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/test-core/libgncmod-test.la \
   ../libgncmod-engine.la \
   ../test-core/libgncmod-test-engine.la \
-  ${top_builddir}/src/core-utils/libcore-utils.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
   ${GLIB_LIBS} \
   ${QOF_LIBS}
 

Modified: gnucash/trunk/src/engine/test-core/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/test-core/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/engine/test-core/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -1,7 +1,7 @@
 check_LTLIBRARIES=libgncmod-test-engine.la
 
 LDADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ../libgncmod-engine.la \
   ${GLIB_LIBS} \
   ${QOF_LIBS}
@@ -9,7 +9,7 @@
 libgncmod_test_engine_la_SOURCES = gncmod-test-engine.c test-engine-stuff.c
 libgncmod_test_engine_la_LDFLAGS = -module
 libgncmod_test_engine_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ../libgncmod-engine.la \
   ${QOF_LIBS} \
   ${GLIB_LIBS}

Modified: gnucash/trunk/src/gnc-module/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/gnc-module/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -6,12 +6,12 @@
    -I${top_srcdir}/src/core-utils \
    ${GLIB_CFLAGS} ${GUILE_INCS}
 
-lib_LTLIBRARIES = libgncmodule.la 
+lib_LTLIBRARIES = libgnc-module.la
 
-libgncmodule_la_SOURCES = gnc-module.c swig-gnc-module.c
+libgnc_module_la_SOURCES = gnc-module.c swig-gnc-module.c
 
-libgncmodule_la_LIBADD = \
-  ../core-utils/libcore-utils.la \
+libgnc_module_la_LIBADD = \
+  ../core-utils/libgnc-core-utils.la \
   ${top_builddir}/lib/libc/libc-missing.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS}

Modified: gnucash/trunk/src/gnc-module/gnc-module.scm
===================================================================
--- gnucash/trunk/src/gnc-module/gnc-module.scm	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/gnc-module/gnc-module.scm	2007-01-07 07:04:23 UTC (rev 15321)
@@ -7,7 +7,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (gnucash gnc-module))
-(load-extension "libgncmodule" "scm_init_sw_gnc_module_module")
+(load-extension "libgnc-module" "scm_init_sw_gnc_module_module")
 (use-modules (sw_gnc_module))
 
 (define gnc:module-system-init gnc-module-system-init)

Modified: gnucash/trunk/src/gnc-module/test/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/gnc-module/test/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -1,6 +1,6 @@
 SUBDIRS = mod-foo mod-bar mod-baz misc-mods
 
-LDADD = ../libgncmodule.la ${GLIB_LIBS} ${GUILE_LIBS}
+LDADD = ../libgnc-module.la ${GLIB_LIBS} ${GUILE_LIBS}
 
 AM_CFLAGS = \
   -I${top_srcdir}/src \

Modified: gnucash/trunk/src/gnc-module/test/misc-mods/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/misc-mods/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/gnc-module/test/misc-mods/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -17,7 +17,7 @@
 libincompatdep_la_SOURCES=incompatdep.c
 libincompatdep_la_LDFLAGS=-module -rpath ${PWD}
 libincompatdep_la_LIBADD = \
-  ../../libgncmodule.la \
+  ../../libgnc-module.la \
   $(GLIB_LIBS)
 
 libagedver_la_SOURCES=agedver.c

Modified: gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -22,7 +22,7 @@
 libgncmodbaz_la_LDFLAGS = -rpath ${PWD}
 libgncmodbaz_la_LIBADD = \
   libbaz.la \
-  ../../libgncmodule.la \
+  ../../libgnc-module.la \
   $(GUILE_LIBS) \
   $(GLIB_LIBS)
 

Modified: gnucash/trunk/src/gnc-module/test/test-dynload.c
===================================================================
--- gnucash/trunk/src/gnc-module/test/test-dynload.c	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/gnc-module/test/test-dynload.c	2007-01-07 07:04:23 UTC (rev 15321)
@@ -15,12 +15,12 @@
 {
   GModule *gmodule;
 
-  printf("  test-dynload.c: testing dynamic linking of libgncmodule ...");
-  gmodule = g_module_open("libgncmodule", 0);
+  printf("  test-dynload.c: testing dynamic linking of libgnc-module ...");
+  gmodule = g_module_open("libgnc-module", 0);
 
   /* Maybe MacOS? */
   if (!gmodule)
-    gmodule = g_module_open("libgncmodule.dylib", 0);
+    gmodule = g_module_open("libgnc-module.dylib", 0);
 
   if (gmodule) {
     gpointer ptr;

Modified: gnucash/trunk/src/gnc-module/test/test-scm-dynload
===================================================================
--- gnucash/trunk/src/gnc-module/test/test-scm-dynload	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/gnc-module/test/test-scm-dynload	2007-01-07 07:04:23 UTC (rev 15321)
@@ -1,12 +1,12 @@
 #! /bin/sh
-echo "  test-scm-dynload: testing dynamic-link of libgncmodule from Scheme.";
+echo "  test-scm-dynload: testing dynamic-link of libgnc-module from Scheme.";
 exec guile -s $0 "$@"
 !#
 
 (if (or (string=? (version) "1.3")
         (string=? (version) "1.3.4"))
-    (dynamic-link "libgncmodule.so")
-    (dynamic-link "libgncmodule"))
+    (dynamic-link "libgnc-module.so")
+    (dynamic-link "libgnc-module"))
 
 ;; LocalVariables:
 ;; mode: scheme

Modified: gnucash/trunk/src/gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/gnome/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -1,8 +1,8 @@
 SUBDIRS = glade schemas ui
 
-lib_LTLIBRARIES = libgncgnome.la
+lib_LTLIBRARIES = libgnc-gnome.la
 
-libgncgnome_la_LIBADD = \
+libgnc_gnome_la_LIBADD = \
   ${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \
   ${top_builddir}/src/register/register-gnome/libgncmod-register-gnome.la \
   ${top_builddir}/src/register/register-core/libgncmod-register-core.la \
@@ -14,11 +14,11 @@
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/calculation/libgncmod-calculation.la \
-  ${top_builddir}/src/core-utils/libcore-utils.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
   ${GLADE_LIBS} \
   ${GUILE_LIBS} ${GNOME_LIBS} ${GLIB_LIBS} ${QOF_LIBS}
 
-libgncgnome_la_SOURCES = \
+libgnc_gnome_la_SOURCES = \
   swig-gnome.c \
   dialog-chart-export.c  \
   dialog-commodities.c \

Modified: gnucash/trunk/src/gnome-search/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-search/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/gnome-search/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -52,8 +52,8 @@
 libgncmod_gnome_search_la_LIBADD = \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_builddir}/src/core-utils/libcore-utils.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
   ${GUILE_LIBS} \
   ${GNOME_LIBS} \
   ${GTKHTML_LIBS} \

Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/gnome-utils/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -163,8 +163,8 @@
   search-param.h
 
 libgncmod_gnome_utils_la_LIBADD = \
-  ${top_builddir}/src/core-utils/libcore-utils.la \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/backend/file/libgnc-backend-file-utils.la \
   ${top_builddir}/src/calculation/libgncmod-calculation.la \

Modified: gnucash/trunk/src/gnome-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/test/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/gnome-utils/test/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -50,7 +50,7 @@
 test_link_module_SOURCES=test-link-module.c
 test_link_module_LDADD= \
   ${GUILE_LIBS} \
-  ${top_builddir}/src/gnc-module/libgncmodule.la
+  ${top_builddir}/src/gnc-module/libgnc-module.la
 
 EXTRA_DIST = \
   test-load-module

Modified: gnucash/trunk/src/import-export/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/import-export/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -43,8 +43,8 @@
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libcore-utils.la \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${GNOME_LIBS} \
   ${GLADE_LIBS} \
   ${QOF_LIBS} \

Modified: gnucash/trunk/src/import-export/binary-import/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/binary-import/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/import-export/binary-import/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -28,7 +28,7 @@
   druid-commodity.h
 
 libgncmod_binary_import_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/calculation/libgncmod-calculation.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \

Modified: gnucash/trunk/src/import-export/hbci/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/hbci/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/import-export/hbci/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -44,12 +44,12 @@
 
 libgncmod_hbci_la_LIBADD = \
   ${top_builddir}/src/import-export/libgncmod-generic-import.la \
-  ${top_builddir}/src/gnome/libgncgnome.la \
+  ${top_builddir}/src/gnome/libgnc-gnome.la \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libcore-utils.la \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${GNOME_LIBS} \
   ${GLADE_LIBS} \
   ${QOF_LIBS} \

Modified: gnucash/trunk/src/import-export/log-replay/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/log-replay/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/import-export/log-replay/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -15,8 +15,8 @@
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libcore-utils.la \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${GTK_LIBS} \
   ${GLIB_LIBS} ${QOF_LIBS}
 

Modified: gnucash/trunk/src/import-export/ofx/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/ofx/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/import-export/ofx/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -16,8 +16,8 @@
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libcore-utils.la \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${QOF_LIBS} \
   ${GLIB_LIBS} \
   ${LIBOFX_LIBS}

Modified: gnucash/trunk/src/import-export/qif/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif/test/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/import-export/qif/test/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -11,7 +11,7 @@
   ${GLIB_CFLAGS} 
 
 LDADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/test-core/libgncmod-test.la \
   ../../libgncmod-generic-import.la \
   ../libgncmod-qif.la \

Modified: gnucash/trunk/src/import-export/qif-import/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-import/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/import-export/qif-import/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -17,12 +17,12 @@
 
 libgncmod_qif_import_la_LIBADD = \
   ${top_builddir}/src/import-export/libgncmod-generic-import.la \
-  ${top_builddir}/src/gnome/libgncgnome.la \
+  ${top_builddir}/src/gnome/libgnc-gnome.la \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/core-utils/libcore-utils.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${GUILE_LIBS} \
   ${GNOME_LIBS} \
   ${GLADE_LIBS} \

Modified: gnucash/trunk/src/import-export/qif-import/qif-import.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif-import.scm	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/import-export/qif-import/qif-import.scm	2007-01-07 07:04:23 UTC (rev 15321)
@@ -9,7 +9,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 
 ;; We do this initialization here because src/gnome isn't a real module.
-(load-extension "libgncgnome" "scm_init_sw_gnome_module")
+(load-extension "libgnc-gnome" "scm_init_sw_gnome_module")
 (use-modules (sw_gnome))
 
 (use-modules (gnucash gnc-module))

Modified: gnucash/trunk/src/import-export/qif-import/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-import/test/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/import-export/qif-import/test/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -6,8 +6,8 @@
   test-link.c
 
 test_link_LDADD=../libgncmod-qif-import.la \
-  ${top_builddir}/src/core-utils/libcore-utils.la \
-  ${top_builddir}/src/gnome/libgncgnome.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/src/gnome/libgnc-gnome.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \

Modified: gnucash/trunk/src/import-export/qif-io-core/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-io-core/test/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/import-export/qif-io-core/test/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -1,4 +1,4 @@
-LDADD=${top_builddir}/src/gnc-module/libgncmodule.la ${GLIB_LIBS}
+LDADD=${top_builddir}/src/gnc-module/libgnc-module.la ${GLIB_LIBS}
 
 AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS} 
 

Modified: gnucash/trunk/src/import-export/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/test/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/import-export/test/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -10,7 +10,7 @@
   ${GLIB_CFLAGS}
 
 LDADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/test-core/libgncmod-test.la \
   ../libgncmod-generic-import.la \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \

Modified: gnucash/trunk/src/network-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/network-utils/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/network-utils/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -23,6 +23,6 @@
   gnc-http.h
 
 libgncmod_network_utils_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${GNOME_LIBS} ${QOF_LIBS}
 

Modified: gnucash/trunk/src/register/ledger-core/Makefile.am
===================================================================
--- gnucash/trunk/src/register/ledger-core/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/register/ledger-core/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -29,8 +29,8 @@
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/core-utils/libcore-utils.la \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${GLADE_LIBS} \
   ${GCONF_LIBS} \
   ${GUILE_LIBS} \

Modified: gnucash/trunk/src/register/register-core/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-core/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/register/register-core/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -3,7 +3,7 @@
 pkglib_LTLIBRARIES = libgncmod-register-core.la
 
 libgncmod_register_core_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \

Modified: gnucash/trunk/src/register/register-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-gnome/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/register/register-gnome/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -4,8 +4,8 @@
 
 libgncmod_register_gnome_la_LIBADD = \
   ${top_builddir}/src/register/register-core/libgncmod-register-core.la \
-  ${top_builddir}/src/core-utils/libcore-utils.la \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \

Modified: gnucash/trunk/src/report/locale-specific/us/Makefile.am
===================================================================
--- gnucash/trunk/src/report/locale-specific/us/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/report/locale-specific/us/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -6,7 +6,7 @@
   gncmod-locale-reports-us.c 
 
 libgncmod_locale_reports_us_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS} 
 

Modified: gnucash/trunk/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/report/report-gnome/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -36,8 +36,8 @@
   window-report.h
 
 libgncmod_report_gnome_la_LIBADD = \
-  ${top_builddir}/src/core-utils/libcore-utils.la \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/report/report-system/libgncmod-report-system.la \

Modified: gnucash/trunk/src/report/report-system/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/report/report-system/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -12,7 +12,7 @@
   gnc-report.h
 
 libgncmod_report_system_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS}

Modified: gnucash/trunk/src/report/standard-reports/Makefile.am
===================================================================
--- gnucash/trunk/src/report/standard-reports/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/report/standard-reports/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -5,7 +5,7 @@
 libgncmod_standard_reports_la_SOURCES = \
   gncmod-standard-reports.c 
 libgncmod_standard_reports_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS}
 

Modified: gnucash/trunk/src/report/stylesheets/Makefile.am
===================================================================
--- gnucash/trunk/src/report/stylesheets/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/report/stylesheets/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -15,7 +15,7 @@
   ${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \
   ${top_builddir}/src/report/report-system/libgncmod-report-system.la \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${QOF_LIBS} \
   ${GUILE_LIBS} \
   ${GLIB_LIBS}

Modified: gnucash/trunk/src/report/utility-reports/Makefile.am
===================================================================
--- gnucash/trunk/src/report/utility-reports/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/report/utility-reports/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -5,7 +5,7 @@
 libgncmod_utility_reports_la_SOURCES = \
   gncmod-utility-reports.c 
 libgncmod_utility_reports_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS}
 

Modified: gnucash/trunk/src/test-core/Makefile.am
===================================================================
--- gnucash/trunk/src/test-core/Makefile.am	2007-01-07 07:04:17 UTC (rev 15320)
+++ gnucash/trunk/src/test-core/Makefile.am	2007-01-07 07:04:23 UTC (rev 15321)
@@ -3,7 +3,7 @@
 libgncmod_test_la_SOURCES = gncmod-test.c test-stuff.c
 libgncmod_test_la_LDFLAGS = -module
 libgncmod_test_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${GLIB_LIBS}
 
 noinst_HEADERS=test-stuff.h



More information about the gnucash-changes mailing list