[Gnucash-changes] Mac OSX fix - remove non-portable settings
Neil Williams
codehelp at cvs.gnucash.org
Thu Oct 13 12:11:35 EDT 2005
Log Message:
-----------
Mac OSX fix - remove non-portable settings
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
ChangeLog
gnucash/macros:
autogen.sh
gnucash/src/app-utils:
Makefile.am
gnucash/src/backend/file/test:
test-load-xml2.c
gnucash/src/business/business-core:
Makefile.am
gncBusPeriod.c
gnucash/src/business/business-gnome:
Makefile.am
gnucash/src/business/business-ledger:
Makefile.am
gnucash/src/business/business-utils:
Makefile.am
gnucash/src/business/dialog-tax-table:
Makefile.am
gnucash/src/calculation:
Makefile.am
gnucash/src/core-utils:
Makefile.am
gnucash/src/engine:
Makefile.am
gnucash/src/engine/test:
Makefile.am
gnucash/src/gnc-module:
Makefile.am
gnucash/src/gnc-module/test/misc-mods:
Makefile.am
gnucash/src/gnc-module/test/mod-bar:
Makefile.am
gnucash/src/gnc-module/test/mod-baz:
Makefile.am
gnucash/src/gnc-module/test/mod-foo:
Makefile.am
gnucash/src/gnome:
Makefile.am
gnucash/src/gnome-search:
Makefile.am
gnucash/src/gnome-utils:
Makefile.am
gnucash/src/import-export:
Makefile.am
gnucash/src/import-export/binary-import:
Makefile.am
gnucash/src/import-export/hbci:
Makefile.am
gnucash/src/import-export/log-replay:
Makefile.am
gnucash/src/import-export/mt940:
Makefile.am
gnucash/src/import-export/ofx:
Makefile.am
gnucash/src/import-export/qif:
Makefile.am
gnucash/src/import-export/qif-import:
Makefile.am
gnucash/src/import-export/qif-io-core:
Makefile.am
gnucash/src/network-utils:
Makefile.am
gnucash/src/register/ledger-core:
Makefile.am
gnucash/src/register/register-core:
Makefile.am
gnucash/src/register/register-gnome:
Makefile.am
gnucash/src/register/register-gnome/test:
Makefile.am
gnucash/src/report/locale-specific/us:
Makefile.am
gnucash/src/report/report-gnome:
Makefile.am
window-report.c
gnucash/src/report/report-system:
Makefile.am
gnucash/src/report/standard-reports:
Makefile.am
gnucash/src/tax/us:
Makefile.am
Revision Data
-------------
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/qif-import/Makefile.am,v
retrieving revision 1.21.4.9
retrieving revision 1.21.4.10
diff -Lsrc/import-export/qif-import/Makefile.am -Lsrc/import-export/qif-import/Makefile.am -u -r1.21.4.9 -r1.21.4.10
--- src/import-export/qif-import/Makefile.am
+++ src/import-export/qif-import/Makefile.am
@@ -15,8 +15,6 @@
gnc-druid-test.h \
gnc-plugin-qif-import.h
-libgncmod_qif_import_la_LDFLAGS = -module
-
libgncmod_qif_import_la_LIBADD = \
${top_builddir}/src/import-export/libgncmod-generic-import.la \
${top_builddir}/src/core-utils/libcore-utils.la \
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.329
retrieving revision 1.1487.2.330
diff -LChangeLog -LChangeLog -u -r1.1487.2.329 -r1.1487.2.330
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,48 @@
+2005-10-13 Neil Williams <linux at codehelp.co.uk>
+
+ * macros/autogen.sh: Mac OSX fix.
+ * src/business/business-core/gncBusPeriod.c: typos.
+
+ Removing non-portable -module setting - Mac OSX fix.
+ * src/app-utils/Makefile.am:
+ * src/business/business-core/Makefile.am:
+ * src/business/business-gnome/Makefile.am
+ * src/business/business-ledger/Makefile.am
+ * src/business/business-utils/Makefile.am
+ * src/business/dialog-tax-table/Makefile.am
+ * src/calculation/Makefile.am
+ * src/core-utils/Makefile.am
+ * src/engine/Makefile.am
+ * src/engine/test/Makefile.am
+ * src/gnc-module/Makefile.am
+ * src/gnc-module/test/misc-mods/Makefile.am
+ * src/gnc-module/test/mod-bar/Makefile.am
+ * src/gnc-module/test/mod-baz/Makefile.am
+ * src/gnc-module/test/mod-foo/Makefile.am
+ * src/gnome-search/Makefile.am
+ * src/gnome-utils/Makefile.am
+ * src/gnome/Makefile.am
+ * src/import-export/Makefile.am
+ * src/import-export/binary-import/Makefile.am
+ * src/import-export/hbci/Makefile.am
+ * src/import-export/log-replay/Makefile.am
+ * src/import-export/mt940/Makefile.am
+ * src/import-export/ofx/Makefile.am
+ * src/import-export/qif-import/Makefile.am
+ * src/import-export/qif-io-core/Makefile.am
+ * src/import-export/qif/Makefile.am
+ * src/network-utils/Makefile.am
+ * src/register/ledger-core/Makefile.am
+ * src/register/register-core/Makefile.am
+ * src/register/register-gnome/Makefile.am
+ * src/register/register-gnome/test/Makefile.am
+ * src/report/locale-specific/us/Makefile.am
+ * src/report/report-gnome/Makefile.am
+ * src/report/report-gnome/window-report.c
+ * src/report/report-system/Makefile.am
+ * src/report/standard-reports/Makefile.am
+ * src/tax/us/Makefile.am:
+
2005-10-13 David Hampton <hampton at employees.org>
* src/business/business-core/gncBusPeriod.c: Patch from Chris
Index: autogen.sh
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/macros/autogen.sh,v
retrieving revision 1.15.4.16
retrieving revision 1.15.4.17
diff -Lmacros/autogen.sh -Lmacros/autogen.sh -u -r1.15.4.16 -r1.15.4.17
--- macros/autogen.sh
+++ macros/autogen.sh
@@ -126,15 +126,15 @@
INTL="--intl --no-changelog";;
esac
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
- (${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`libtool' installed to compile GnuCash."
- echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.4.2.tar.gz"
- echo "(or a newer version if it is available)"
- DIE=1
- }
-}
+# (grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+# (${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
+# echo
+# echo "**Error**: You must have \`libtool' installed to compile GnuCash."
+# echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.4.2.tar.gz"
+# echo "(or a newer version if it is available)"
+# DIE=1
+# }
+#}
grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/Makefile.am,v
retrieving revision 1.29.4.14
retrieving revision 1.29.4.15
diff -Lsrc/app-utils/Makefile.am -Lsrc/app-utils/Makefile.am -u -r1.29.4.14 -r1.29.4.15
--- src/app-utils/Makefile.am
+++ src/app-utils/Makefile.am
@@ -67,8 +67,6 @@
noinst_HEADERS = \
gw-app-utils.h
-libgncmod_app_utils_la_LDFLAGS = -module
-
libgncmod_app_utils_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/engine/libgncmod-engine.la \
@@ -79,7 +77,6 @@
${GLIB_LIBS}
libgw_app_utils_la_SOURCES = gw-app-utils.c
-libgw_app_utils_la_LDFLAGS = -module
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
gncmod_DATA = app-utils.scm
Index: test-load-xml2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-load-xml2.c,v
retrieving revision 1.10.4.3
retrieving revision 1.10.4.4
diff -Lsrc/backend/file/test/test-load-xml2.c -Lsrc/backend/file/test/test-load-xml2.c -u -r1.10.4.3 -r1.10.4.4
--- src/backend/file/test/test-load-xml2.c
+++ src/backend/file/test/test-load-xml2.c
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
+
/* @file test-load-xml2.c
* @brief test the loading of a version-2 gnucash XML file
*/
@@ -154,6 +154,6 @@
closedir(xml2_dir);
print_test_results();
- qof_close();
- return 0;
+ qof_close();
+ return 0;
}
Index: gncBusPeriod.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/gncBusPeriod.c,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -Lsrc/business/business-core/gncBusPeriod.c -Lsrc/business/business-core/gncBusPeriod.c -u -r1.8.2.1 -r1.8.2.2
--- src/business/business-core/gncBusPeriod.c
+++ src/business/business-core/gncBusPeriod.c
@@ -1,7 +1,7 @@
/*
XXX TODO:
--- contemplate a per-colection (per type) edit/commmit-edit,
+-- contemplate a per-collection (per type) edit/commmit-edit,
clone, dirty, etc. functions some more ...
-- turn clone into a generic object callback, so that
@@ -14,13 +14,13 @@
-- billterm and taxtables are incompletely cloned, not sure
what to do with refcount, ask warlord, need to explore.
--- The following busines objects have an id/name/desc/active
+-- The following business objects have an id/name/desc/active
this could be abstracted into an common object.
vendor (customer)
bill term (but bill terms doesn't have id or active)
job
--- gnVendor should be a base class to gncCustomer (they're
+-- gncVendor should be a base class to gncCustomer (they're
identical, but customer adds more stuff).
Employee could be base class for vendor, its got some of the
@@ -76,8 +76,6 @@
/* Copy all bill terms first, since the CustomerCopy expects
* these to be in place already. */
-/* XXX not strictly needed, the customer can pull thier own .. ? */
+/* XXX not strictly needed, the customer can pull their own .. ? */
gncBillTermCopyAll (dest_book, src_book);
}
-
-
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/Makefile.am,v
retrieving revision 1.18.4.2
retrieving revision 1.18.4.3
diff -Lsrc/business/business-core/Makefile.am -Lsrc/business/business-core/Makefile.am -u -r1.18.4.2 -r1.18.4.3
--- src/business/business-core/Makefile.am
+++ src/business/business-core/Makefile.am
@@ -55,8 +55,6 @@
gncVendorP.h \
gw-business-core.h
-libgncmod_business_core_la_LDFLAGS = -module
-
libgncmod_business_core_la_LIBADD = \
${GUILE_LIBS} \
${GLIB_LIBS} \
@@ -65,7 +63,8 @@
# business-core-helpers.c
libgw_business_core_la_SOURCES = gw-business-core.c
-libgw_business_core_la_LDFLAGS = -module ${G_WRAP_LINK_ARGS}
+
+libgw_business_core_la_LDFLAGS = ${G_WRAP_LINK_ARGS}
libgw_business_core_la_LIBADD = libgncmod-business-core.la
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-gnome/Makefile.am,v
retrieving revision 1.31.4.13
retrieving revision 1.31.4.14
diff -Lsrc/business/business-gnome/Makefile.am -Lsrc/business/business-gnome/Makefile.am -u -r1.31.4.13 -r1.31.4.14
--- src/business/business-gnome/Makefile.am
+++ src/business/business-gnome/Makefile.am
@@ -64,8 +64,6 @@
search-owner.h \
gw-business-gnome.h
-libgncmod_business_gnome_la_LDFLAGS = -module
-
libgncmod_business_gnome_la_LIBADD = \
${top_builddir}/src/business/business-core/libgncmod-business-core.la \
${top_builddir}/src/business/business-ledger/libgnc-business-ledger.la \
@@ -79,7 +77,8 @@
libgw_business_gnome_la_SOURCES = gw-business-gnome.c
-libgw_business_gnome_la_LDFLAGS = -module ${G_WRAP_LINK_ARGS}
+
+libgw_business_gnome_la_LDFLAGS = ${G_WRAP_LINK_ARGS}
libgw_business_gnome_la_LIBADD = libgncmod-business-gnome.la
# For Business Reports
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-ledger/Makefile.am,v
retrieving revision 1.6.4.3
retrieving revision 1.6.4.4
diff -Lsrc/business/business-ledger/Makefile.am -Lsrc/business/business-ledger/Makefile.am -u -r1.6.4.3 -r1.6.4.4
--- src/business/business-ledger/Makefile.am
+++ src/business/business-ledger/Makefile.am
@@ -17,7 +17,6 @@
gncEntryLedgerLayout.h \
gncEntryLedgerModel.h
-libgnc_business_ledger_la_LDFLAGS = -module
libgnc_business_ledger_la_LIBADD = \
${top_builddir}/src/core-utils/libcore-utils.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-utils/Makefile.am,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -Lsrc/business/business-utils/Makefile.am -Lsrc/business/business-utils/Makefile.am -u -r1.3.2.1 -r1.3.2.2
--- src/business/business-utils/Makefile.am
+++ src/business/business-utils/Makefile.am
@@ -18,7 +18,6 @@
noinst_HEADERS = \
business-options.h
-libgncmod_business_utils_la_LDFLAGS = -module
libgncmod_business_utils_la_LIBADD = \
${GUILE_LIBS} \
${GLIB_LIBS} \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/qif-io-core/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -Lsrc/import-export/qif-io-core/Makefile.am -Lsrc/import-export/qif-io-core/Makefile.am -u -r1.7 -r1.7.4.1
--- src/import-export/qif-io-core/Makefile.am
+++ src/import-export/qif-io-core/Makefile.am
@@ -5,7 +5,6 @@
AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
libgncmod_qifiocore_la_SOURCES = gncmod-qifiocore.c
-libgncmod_qifiocore_la_LDFLAGS = -module
noinst_DATA = .scm-links
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/dialog-tax-table/Makefile.am,v
retrieving revision 1.5.4.5
retrieving revision 1.5.4.6
diff -Lsrc/business/dialog-tax-table/Makefile.am -Lsrc/business/dialog-tax-table/Makefile.am -u -r1.5.4.5 -r1.5.4.6
--- src/business/dialog-tax-table/Makefile.am
+++ src/business/dialog-tax-table/Makefile.am
@@ -27,8 +27,6 @@
dialog-tax-table.h \
gw-dialog-tax-table.h
-libgncmod_dialog_tax_table_la_LDFLAGS = -module
-
libgncmod_dialog_tax_table_la_LIBADD = \
../../gnc-module/libgncmodule.la \
../../core-utils/libcore-utils.la \
@@ -39,7 +37,8 @@
${EFENCE_LIBS}
libgw_dialog_tax_table_la_SOURCES = gw-dialog-tax-table.c
-libgw_dialog_tax_table_la_LDFLAGS = -module ${G_WRAP_LINK_ARGS}
+
+libgw_dialog_tax_table_la_LDFLAGS = ${G_WRAP_LINK_ARGS}
gwmoddir = ${GNC_GWRAP_LIBDIR}
gwmod_DATA = \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/network-utils/Makefile.am,v
retrieving revision 1.7.4.3
retrieving revision 1.7.4.4
diff -Lsrc/network-utils/Makefile.am -Lsrc/network-utils/Makefile.am -u -r1.7.4.3 -r1.7.4.4
--- src/network-utils/Makefile.am
+++ src/network-utils/Makefile.am
@@ -23,8 +23,6 @@
gnc-gpg.h \
gnc-http.h
-libgncmod_network_utils_la_LDFLAGS = -module
-
libgncmod_network_utils_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
${GNOME_LIBS}
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/calculation/Makefile.am,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -Lsrc/calculation/Makefile.am -Lsrc/calculation/Makefile.am -u -r1.11.2.1 -r1.11.2.2
--- src/calculation/Makefile.am
+++ src/calculation/Makefile.am
@@ -2,7 +2,6 @@
pkglib_LTLIBRARIES = libgncmod-calculation.la
-libgncmod_calculation_la_LDFLAGS = -module
libgncmod_calculation_la_LIBADD = ${GLIB_LIBS} ${GUILE_LIBS}
libgncmod_calculation_la_SOURCES = \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/ledger-core/Makefile.am,v
retrieving revision 1.25.4.2
retrieving revision 1.25.4.3
diff -Lsrc/register/ledger-core/Makefile.am -Lsrc/register/ledger-core/Makefile.am -u -r1.25.4.2 -r1.25.4.3
--- src/register/ledger-core/Makefile.am
+++ src/register/ledger-core/Makefile.am
@@ -23,7 +23,6 @@
split-register-model-save.h \
split-register-p.h
-libgncmod_ledger_core_la_LDFLAGS = -module
libgncmod_ledger_core_la_LIBADD = \
${top_builddir}/src/core-utils/libcore-utils.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/core-utils/Makefile.am,v
retrieving revision 1.7.4.7
retrieving revision 1.7.4.8
diff -Lsrc/core-utils/Makefile.am -Lsrc/core-utils/Makefile.am -u -r1.7.4.7 -r1.7.4.8
--- src/core-utils/Makefile.am
+++ src/core-utils/Makefile.am
@@ -7,8 +7,6 @@
gnc-gkeyfile-utils.c \
gnc-gobject-utils.c
-libcore_utils_la_LDFLAGS = -module
-
libcore_utils_la_LIBADD = \
${top_builddir}/lib/glib26/libgncglib.la \
${GLIB_LIBS} \
@@ -18,7 +16,7 @@
libgw_core_utils_la_SOURCES = \
gw-core-utils.c
-libgw_core_utils_la_LDFLAGS = -module ${G_WRAP_LINK_ARGS}
+libgw_core_utils_la_LDFLAGS = ${G_WRAP_LINK_ARGS}
libgw_core_utils_la_LIBADD = \
libcore-utils.la \
${GUILE_LIBS}
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/Makefile.am,v
retrieving revision 1.94.2.16
retrieving revision 1.94.2.17
diff -Lsrc/engine/Makefile.am -Lsrc/engine/Makefile.am -u -r1.94.2.16 -r1.94.2.17
--- src/engine/Makefile.am
+++ src/engine/Makefile.am
@@ -169,7 +169,6 @@
noinst_SCRIPTS = iso-currencies-to-c
-libgncmod_engine_la_LDFLAGS = -module
libgncmod_engine_la_LIBADD = ${GNUCASH_ENGINE_BASE_LIBS} \
libgw-engine.la \
libgw-kvp.la \
@@ -177,10 +176,12 @@
../../lib/libc/libc-missing.la
libgw_kvp_la_SOURCES = gw-kvp.c kvp-scm.c
-libgw_kvp_la_LDFLAGS = -module ${G_WRAP_LINK_ARGS}
+
+libgw_kvp_la_LDFLAGS = ${G_WRAP_LINK_ARGS}
libgw_engine_la_SOURCES = gw-engine.c engine-helpers.c glib-helpers.c
-libgw_engine_la_LDFLAGS = -module ${G_WRAP_LINK_ARGS}
+
+libgw_engine_la_LDFLAGS = ${G_WRAP_LINK_ARGS}
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
gncmod_DATA = engine.scm
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/register-core/Makefile.am,v
retrieving revision 1.27.4.2
retrieving revision 1.27.4.3
diff -Lsrc/register/register-core/Makefile.am -Lsrc/register/register-core/Makefile.am -u -r1.27.4.2 -r1.27.4.3
--- src/register/register-core/Makefile.am
+++ src/register/register-core/Makefile.am
@@ -3,7 +3,6 @@
pkglib_LTLIBRARIES = libgncmod-register-core.la libgw-register-core.la
-libgncmod_register_core_la_LDFLAGS = -module
libgncmod_register_core_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/engine/libgncmod-engine.la \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/test/Makefile.am,v
retrieving revision 1.29.4.7
retrieving revision 1.29.4.8
diff -Lsrc/engine/test/Makefile.am -Lsrc/engine/test/Makefile.am -u -r1.29.4.7 -r1.29.4.8
--- src/engine/test/Makefile.am
+++ src/engine/test/Makefile.am
@@ -13,7 +13,6 @@
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/test-core/libgncmod-test.la \
../libgncmod-engine.la \
- ../qof_book_merge.lo \
../libgw-engine.la \
../libgw-kvp.la \
../test-core/libgncmod-test-engine.la \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/register-gnome/Makefile.am,v
retrieving revision 1.16.4.2
retrieving revision 1.16.4.3
diff -Lsrc/register/register-gnome/Makefile.am -Lsrc/register/register-gnome/Makefile.am -u -r1.16.4.2 -r1.16.4.3
--- src/register/register-gnome/Makefile.am
+++ src/register/register-gnome/Makefile.am
@@ -2,7 +2,6 @@
pkglib_LTLIBRARIES = libgncmod-register-gnome.la
-libgncmod_register_gnome_la_LDFLAGS = -module
libgncmod_register_gnome_la_LIBADD = \
${top_builddir}/src/register/register-core/libgncmod-register-core.la \
${top_builddir}/src/core-utils/libcore-utils.la \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnc-module/Makefile.am,v
retrieving revision 1.24.4.2
retrieving revision 1.24.4.3
diff -Lsrc/gnc-module/Makefile.am -Lsrc/gnc-module/Makefile.am -u -r1.24.4.2 -r1.24.4.3
--- src/gnc-module/Makefile.am
+++ src/gnc-module/Makefile.am
@@ -10,7 +10,7 @@
pkglib_LTLIBRARIES = libgw-gnc-module.la
libgncmodule_la_SOURCES = gnc-module.c
-libgncmodule_la_LDFLAGS = -module
+
libgncmodule_la_LIBADD = \
../core-utils/libcore-utils.la \
${G_WRAP_LINK_ARGS} \
@@ -19,7 +19,7 @@
-lltdl
libgw_gnc_module_la_SOURCES = gw-gnc-module.c
-libgw_gnc_module_la_LDFLAGS = -module
+
libgw_gnc_module_la_LIBADD = libgncmodule.la \
${G_WRAP_LINK_ARGS} \
${GUILE_LIBS} \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/register-gnome/test/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -Lsrc/register/register-gnome/test/Makefile.am -Lsrc/register/register-gnome/test/Makefile.am -u -r1.7 -r1.7.4.1
--- src/register/register-gnome/test/Makefile.am
+++ src/register/register-gnome/test/Makefile.am
@@ -12,7 +12,10 @@
test-link-module
test_link_module_SOURCES = test-link-module.c
-test_link_module_LDADD = ../libgncmod-register-gnome.la
+test_link_module_LDADD = \
+ ${top_builddir}/src/engine/libgncmod-engine.la \
+ ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
+ ../libgncmod-register-gnome.la
#EXTRA_DIST = test-load-module
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnc-module/test/misc-mods/Makefile.am,v
retrieving revision 1.7.4.3
retrieving revision 1.7.4.4
diff -Lsrc/gnc-module/test/misc-mods/Makefile.am -Lsrc/gnc-module/test/misc-mods/Makefile.am -u -r1.7.4.3 -r1.7.4.4
--- src/gnc-module/test/misc-mods/Makefile.am
+++ src/gnc-module/test/misc-mods/Makefile.am
@@ -11,13 +11,11 @@
checklib_LTLIBRARIES=libfuturemodsys.la libincompatdep.la libagedver.la
libfuturemodsys_la_SOURCES=futuremodsys.c
-libfuturemodsys_la_LDFLAGS=-module
libincompatdep_la_SOURCES=incompatdep.c
libincompatdep_la_LDFLAGS=-module
libagedver_la_SOURCES=agedver.c
-libagedver_la_LDFLAGS=-module
CLEANFILES = *.so* *.a
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/report/locale-specific/us/Makefile.am,v
retrieving revision 1.11.4.2
retrieving revision 1.11.4.3
diff -Lsrc/report/locale-specific/us/Makefile.am -Lsrc/report/locale-specific/us/Makefile.am -u -r1.11.4.2 -r1.11.4.3
--- src/report/locale-specific/us/Makefile.am
+++ src/report/locale-specific/us/Makefile.am
@@ -5,7 +5,6 @@
libgncmod_locale_reports_us_la_SOURCES = \
gncmod-locale-reports-us.c
-libgncmod_locale_reports_us_la_LDFLAGS = -module
libgncmod_locale_reports_us_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
${GUILE_LIBS} \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnc-module/test/mod-bar/Makefile.am,v
retrieving revision 1.15.4.2
retrieving revision 1.15.4.3
diff -Lsrc/gnc-module/test/mod-bar/Makefile.am -Lsrc/gnc-module/test/mod-bar/Makefile.am -u -r1.15.4.2 -r1.15.4.3
--- src/gnc-module/test/mod-bar/Makefile.am
+++ src/gnc-module/test/mod-bar/Makefile.am
@@ -9,7 +9,6 @@
checklibdir=${PWD}
checklib_LTLIBRARIES = libbar.la libgncmodbar.la
-libbar_la_LDFLAGS = -module
libbar_la_SOURCES = bar.c
noinst_HEADERS = \
@@ -17,7 +16,7 @@
bar-gwrap.h
libgncmodbar_la_SOURCES=bar-gwrap.c gnc-mod-bar.c
-libgncmodbar_la_LDFLAGS=-module
+
libgncmodbar_la_LIBADD=libbar.la
EXTRA_DIST = \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnc-module/test/mod-baz/Makefile.am,v
retrieving revision 1.13.4.2
retrieving revision 1.13.4.3
diff -Lsrc/gnc-module/test/mod-baz/Makefile.am -Lsrc/gnc-module/test/mod-baz/Makefile.am -u -r1.13.4.2 -r1.13.4.3
--- src/gnc-module/test/mod-baz/Makefile.am
+++ src/gnc-module/test/mod-baz/Makefile.am
@@ -10,7 +10,6 @@
checklibdir = ${PWD}
checklib_LTLIBRARIES = libbaz.la libgncmodbaz.la
-libbaz_la_LDFLAGS = -module
libbaz_la_SOURCES = baz.c
noinst_HEADERS = \
@@ -18,7 +17,6 @@
baz-gwrap.h
libgncmodbaz_la_SOURCES = baz-gwrap.c gnc-mod-baz.c
-libgncmodbaz_la_LDFLAGS = -module
libgncmodbaz_la_LIBADD = ../mod-foo/libfoo.la libbaz.la
Index: window-report.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/report/report-gnome/window-report.c,v
retrieving revision 1.15.4.13
retrieving revision 1.15.4.14
diff -Lsrc/report/report-gnome/window-report.c -Lsrc/report/report-gnome/window-report.c -u -r1.15.4.13 -r1.15.4.14
--- src/report/report-gnome/window-report.c
+++ src/report/report-gnome/window-report.c
@@ -153,7 +153,7 @@
title = SCM_STRING_CHARS(ptr);
}
/* Don't forget to translate the window title */
- prm->win = gnc_options_dialog_new(_(title));
+ prm->win = gnc_options_dialog_new((gchar*)_(title));
scm_gc_protect_object(prm->scm_options);
scm_gc_protect_object(prm->cur_report);
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/report/report-gnome/Makefile.am,v
retrieving revision 1.14.4.9
retrieving revision 1.14.4.10
diff -Lsrc/report/report-gnome/Makefile.am -Lsrc/report/report-gnome/Makefile.am -u -r1.14.4.9 -r1.14.4.10
--- src/report/report-gnome/Makefile.am
+++ src/report/report-gnome/Makefile.am
@@ -36,8 +36,6 @@
gnc-plugin-page-report.h \
window-report.h
-libgncmod_report_gnome_la_LDFLAGS = -module
-
libgncmod_report_gnome_la_LIBADD = \
${top_builddir}/src/core-utils/libcore-utils.la \
${top_builddir}/src/gnc-module/libgncmodule.la \
@@ -50,7 +48,6 @@
${GLIB_LIBS}
libgw_report_gnome_la_SOURCES = gw-report-gnome.c
-libgw_report_gnome_la_LDFLAGS = -module
gwmoddir = ${GNC_GWRAP_LIBDIR}
gwmod_DATA = gw-report-gnome.scm gw-report-gnome-spec.scm
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnc-module/test/mod-foo/Makefile.am,v
retrieving revision 1.14.4.2
retrieving revision 1.14.4.3
diff -Lsrc/gnc-module/test/mod-foo/Makefile.am -Lsrc/gnc-module/test/mod-foo/Makefile.am -u -r1.14.4.2 -r1.14.4.3
--- src/gnc-module/test/mod-foo/Makefile.am
+++ src/gnc-module/test/mod-foo/Makefile.am
@@ -9,7 +9,6 @@
checklibdir=${PWD}
checklib_LTLIBRARIES=libfoo.la libgncmodfoo.la
-libfoo_la_LDFLAGS = -module
libfoo_la_SOURCES = foo.c
noinst_HEADERS = \
@@ -17,7 +16,7 @@
foo-gwrap.h
libgncmodfoo_la_SOURCES = foo-gwrap.c gnc-mod-foo.c
-libgncmodfoo_la_LDFLAGS = -module
+
libgncmodfoo_la_LIBADD = libfoo.la
EXTRA_DIST = \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/report/report-system/Makefile.am,v
retrieving revision 1.11.4.2
retrieving revision 1.11.4.3
diff -Lsrc/report/report-system/Makefile.am -Lsrc/report/report-system/Makefile.am -u -r1.11.4.2 -r1.11.4.3
--- src/report/report-system/Makefile.am
+++ src/report/report-system/Makefile.am
@@ -10,7 +10,6 @@
gncinclude_HEADERS = \
gnc-report.h
-libgncmod_report_system_la_LDFLAGS = -module
libgncmod_report_system_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
${GUILE_LIBS} \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Makefile.am,v
retrieving revision 1.107.4.27
retrieving revision 1.107.4.28
diff -Lsrc/gnome/Makefile.am -Lsrc/gnome/Makefile.am -u -r1.107.4.27 -r1.107.4.28
--- src/gnome/Makefile.am
+++ src/gnome/Makefile.am
@@ -6,7 +6,6 @@
gwmod_DATA = gw-gnc-spec.scm gw-gnc.scm
#nodist_gwmod_DATA = gw-gnc.scm
-libgncgnome_la_LDFLAGS = -module
libgncgnome_la_LIBADD = \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/report/report-system/libgncmod-report-system.la \
@@ -16,7 +15,8 @@
${GUILE_LIBS} ${GNOME_LIBS} ${GLIB_LIBS}
libgw_gnc_la_SOURCES = gw-gnc.c
-libgw_gnc_la_LDFLAGS = -module \
+
+libgw_gnc_la_LDFLAGS = \
${G_WRAP_LINK_ARGS} ${GLIB_LIBS}
libgw_gnc_la_LIBADD = libgncgnome.la
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/report/standard-reports/Makefile.am,v
retrieving revision 1.12.4.3
retrieving revision 1.12.4.4
diff -Lsrc/report/standard-reports/Makefile.am -Lsrc/report/standard-reports/Makefile.am -u -r1.12.4.3 -r1.12.4.4
--- src/report/standard-reports/Makefile.am
+++ src/report/standard-reports/Makefile.am
@@ -5,8 +5,6 @@
libgncmod_standard_reports_la_SOURCES = \
gncmod-standard-reports.c
-libgncmod_standard_reports_la_LDFLAGS = -module
-
AM_CFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-search/Makefile.am,v
retrieving revision 1.12.2.7
retrieving revision 1.12.2.8
diff -Lsrc/gnome-search/Makefile.am -Lsrc/gnome-search/Makefile.am -u -r1.12.2.7 -r1.12.2.8
--- src/gnome-search/Makefile.am
+++ src/gnome-search/Makefile.am
@@ -49,8 +49,6 @@
search-reconciled.h \
search-string.h
-libgncmod_gnome_search_la_LDFLAGS = -module
-
libgncmod_gnome_search_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/core-utils/libcore-utils.la \
@@ -67,6 +65,5 @@
EXTRA_DIST = \
.cvsignore \
- ${glade_DATA} \
- ${gncmod_DATA} \
- ${gwmod_DATA}
+ ${glade_DATA}
+
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Makefile.am,v
retrieving revision 1.48.2.40
retrieving revision 1.48.2.41
diff -Lsrc/gnome-utils/Makefile.am -Lsrc/gnome-utils/Makefile.am -u -r1.48.2.40 -r1.48.2.41
--- src/gnome-utils/Makefile.am
+++ src/gnome-utils/Makefile.am
@@ -3,8 +3,6 @@
pkglib_LTLIBRARIES = libgncmod-gnome-utils.la libgw-gnome-utils.la
-# Fix the goffice links to be conditional
-
# Note that src/gnome-utils CANNOT depend on src/gnome!
if USE_LIBGOFFICE
AM_CFLAGS = \
@@ -46,12 +44,12 @@
-I${top_srcdir}/lib \
-I${top_srcdir}/src \
${LIBGUPPI_CFLAGS} \
- ${GLIB_CFLAGS} \
- ${GLADE_CFLAGS} \
- ${GNOME_PRINT_CFLAGS} \
${GNOME_CFLAGS} \
${GTKHTML_CFLAGS} \
+ ${GLIB_CFLAGS} \
+ ${GLADE_CFLAGS} \
${GUILE_INCS} \
+ ${GNOME_PRINT_CFLAGS} \
${G_WRAP_COMPILE_ARGS} \
${GSF_CFLAGS}
endif
@@ -195,8 +193,6 @@
gw-gnome-utils.h \
search-param.h
-libgncmod_gnome_utils_la_LDFLAGS = -module
-
if USE_LIBGOFFICE
libgncmod_gnome_utils_la_LIBADD = \
${top_builddir}/src/core-utils/libcore-utils.la \
@@ -242,7 +238,6 @@
endif
libgw_gnome_utils_la_SOURCES = gw-gnome-utils.c
-libgw_gnome_utils_la_LDFLAGS = -module
gwmoddir = ${GNC_GWRAP_LIBDIR}
gwmod_DATA = gw-gnome-utils.scm gw-gnome-utils-spec.scm
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/Makefile.am,v
retrieving revision 1.25.4.13
retrieving revision 1.25.4.14
diff -Lsrc/import-export/Makefile.am -Lsrc/import-export/Makefile.am -u -r1.25.4.13 -r1.25.4.14
--- src/import-export/Makefile.am
+++ src/import-export/Makefile.am
@@ -37,8 +37,6 @@
import-utilities.h \
gnc-import-format-gnome.h
-libgncmod_generic_import_la_LDFLAGS = -module
-
libgncmod_generic_import_la_LIBADD = \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/gnc-module/libgncmodule.la \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/binary-import/Makefile.am,v
retrieving revision 1.15.4.5
retrieving revision 1.15.4.6
diff -Lsrc/import-export/binary-import/Makefile.am -Lsrc/import-export/binary-import/Makefile.am -u -r1.15.4.5 -r1.15.4.6
--- src/import-export/binary-import/Makefile.am
+++ src/import-export/binary-import/Makefile.am
@@ -27,8 +27,6 @@
gncinclude_HEADERS = \
druid-commodity.h
-libgncmod_binary_import_la_LDFLAGS = -module
-
libgncmod_binary_import_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/engine/libgncmod-engine.la \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/Makefile.am,v
retrieving revision 1.22.4.13
retrieving revision 1.22.4.14
diff -Lsrc/import-export/hbci/Makefile.am -Lsrc/import-export/hbci/Makefile.am -u -r1.22.4.13 -r1.22.4.14
--- src/import-export/hbci/Makefile.am
+++ src/import-export/hbci/Makefile.am
@@ -40,9 +40,6 @@
hbci-interaction.h \
hbci-interactionP.h
-
-libgncmod_hbci_la_LDFLAGS = -module
-
libgncmod_hbci_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/core-utils/libcore-utils.la \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/log-replay/Makefile.am,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -Lsrc/import-export/log-replay/Makefile.am -Lsrc/import-export/log-replay/Makefile.am -u -r1.1.4.6 -r1.1.4.7
--- src/import-export/log-replay/Makefile.am
+++ src/import-export/log-replay/Makefile.am
@@ -11,8 +11,6 @@
gnc-log-replay.h \
gnc-plugin-log-replay.h
-libgncmod_log_replay_la_LDFLAGS = -module
-
libgncmod_log_replay_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/core-utils/libcore-utils.la \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/mt940/Makefile.am,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -Lsrc/import-export/mt940/Makefile.am -Lsrc/import-export/mt940/Makefile.am -u -r1.1.2.4 -r1.1.2.5
--- src/import-export/mt940/Makefile.am
+++ src/import-export/mt940/Makefile.am
@@ -12,8 +12,6 @@
gnc-mt940-import.h \
gnc-plugin-mt940.h
-libgncmod_mt940_la_LDFLAGS = -module
-
libgncmod_mt940_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/engine/libgncmod-engine.la \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/ofx/Makefile.am,v
retrieving revision 1.10.4.6
retrieving revision 1.10.4.7
diff -Lsrc/import-export/ofx/Makefile.am -Lsrc/import-export/ofx/Makefile.am -u -r1.10.4.6 -r1.10.4.7
--- src/import-export/ofx/Makefile.am
+++ src/import-export/ofx/Makefile.am
@@ -11,8 +11,6 @@
gnc-ofx-import.h \
gnc-plugin-ofx.h
-libgncmod_ofx_la_LDFLAGS = -module
-
libgncmod_ofx_la_LIBADD = \
${top_builddir}/src/core-utils/libcore-utils.la \
${top_builddir}/src/gnc-module/libgncmodule.la \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/qif/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -Lsrc/import-export/qif/Makefile.am -Lsrc/import-export/qif/Makefile.am -u -r1.1 -r1.1.2.1
--- src/import-export/qif/Makefile.am
+++ src/import-export/qif/Makefile.am
@@ -18,8 +18,6 @@
qif-objects-p.h \
qif-parse.h
-libgncmod_qif_la_LDFLAGS = -module
-
libgncmod_qif_la_LIBADD =
AM_CFLAGS = \
@@ -28,4 +26,7 @@
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/import-export \
- ${GLIB_CFLAGS}
+ ${GLIB_CFLAGS} \
+ ${GUILE_INCS} \
+ ${G_WRAP_COMPILE_ARGS}
+
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/tax/us/Makefile.am,v
retrieving revision 1.9.4.2
retrieving revision 1.9.4.3
diff -Lsrc/tax/us/Makefile.am -Lsrc/tax/us/Makefile.am -u -r1.9.4.2 -r1.9.4.3
--- src/tax/us/Makefile.am
+++ src/tax/us/Makefile.am
@@ -5,7 +5,6 @@
libgncmod_tax_us_la_SOURCES = \
gncmod-tax-us.c
-libgncmod_tax_us_la_LDFLAGS = -module
libgncmod_tax_us_la_LIBADD = \
${GUILE_LIBS} \
${GLIB_LIBS}
More information about the gnucash-changes
mailing list