r15010 - gnucash/branches/swig-redo - Remove even more remnants of g-wrap.
Andreas Köhler
andi5 at cvs.gnucash.org
Wed Oct 11 16:55:55 EDT 2006
Author: andi5
Date: 2006-10-11 16:55:52 -0400 (Wed, 11 Oct 2006)
New Revision: 15010
Trac: http://svn.gnucash.org/trac/changeset/15010
Modified:
gnucash/branches/swig-redo/
gnucash/branches/swig-redo/Makefile.am
gnucash/branches/swig-redo/src/bin/Makefile.am
gnucash/branches/swig-redo/src/bin/gnucash-valgrind.in
gnucash/branches/swig-redo/src/bin/gnucash.in
gnucash/branches/swig-redo/src/bin/overrides/Makefile.am
gnucash/branches/swig-redo/src/bin/overrides/gnucash-build-env.in
gnucash/branches/swig-redo/src/bin/overrides/gnucash-env.in
gnucash/branches/swig-redo/src/engine/Makefile.am
gnucash/branches/swig-redo/src/gnome/Makefile.am
gnucash/branches/swig-redo/src/import-export/Makefile.am
gnucash/branches/swig-redo/src/import-export/log-replay/Makefile.am
gnucash/branches/swig-redo/src/import-export/qif-import/Makefile.am
Log:
Remove even more remnants of g-wrap.
Property changes on: gnucash/branches/swig-redo
___________________________________________________________________
Name: svk:merge
- 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:776
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:12971
+ 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:780
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:12971
Modified: gnucash/branches/swig-redo/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/Makefile.am 2006-10-11 20:55:20 UTC (rev 15009)
+++ gnucash/branches/swig-redo/Makefile.am 2006-10-11 20:55:52 UTC (rev 15010)
@@ -47,7 +47,6 @@
macros/aqbanking.m4 \
macros/as-scrub-include.m4 \
macros/compiler-flags.m4 \
- macros/g-wrap.m4 \
macros/ac_pkg_swig.m4 \
macros/gnome-guile-checks.m4 \
macros/legacy_macros.m4 \
Modified: gnucash/branches/swig-redo/src/bin/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/bin/Makefile.am 2006-10-11 20:55:20 UTC (rev 15009)
+++ gnucash/branches/swig-redo/src/bin/Makefile.am 2006-10-11 20:55:52 UTC (rev 15010)
@@ -32,8 +32,6 @@
rm -f $@.tmp
sed < $< > $@.tmp \
-e 's:@-BIN_DIR-@:${bindir}:g' \
- -e 's:@-G_WRAP_MODULE_DIR-@:${G_WRAP_MODULE_DIR}:g' \
- -e 's:@-G_WRAP_LIB_DIR-@:${G_WRAP_LIB_DIR}:g' \
-e 's:@-GNC_GUILE_MODULE_DIR-@:${GNC_SHAREDIR}/guile-modules:g' \
-e 's:@-GNC_SCM_INSTALL_DIR-@:${GNC_SCM_INSTALL_DIR}:g' \
-e 's:@-GNC_LIB_INSTALLDIR-@:${libdir}:' \
@@ -56,8 +54,6 @@
rm -f $@.tmp
sed < $< > $@.tmp \
-e 's:@-BIN_DIR-@:${bindir}:g' \
- -e 's:@-G_WRAP_MODULE_DIR-@:${G_WRAP_MODULE_DIR}:g' \
- -e 's:@-G_WRAP_LIB_DIR-@:${G_WRAP_LIB_DIR}:g' \
-e 's:@-GNC_GUILE_MODULE_DIR-@:${GNC_SHAREDIR}/guile-modules:g' \
-e 's:@-GNC_SCM_INSTALL_DIR-@:${GNC_SCM_INSTALL_DIR}:g' \
-e 's:@-GNC_LIB_INSTALLDIR-@:${libdir}:' \
Modified: gnucash/branches/swig-redo/src/bin/gnucash-valgrind.in
===================================================================
--- gnucash/branches/swig-redo/src/bin/gnucash-valgrind.in 2006-10-11 20:55:20 UTC (rev 15009)
+++ gnucash/branches/swig-redo/src/bin/gnucash-valgrind.in 2006-10-11 20:55:52 UTC (rev 15010)
@@ -8,7 +8,6 @@
GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@:${GNC_MODULE_PATH}"
-EXTRA_PATH="@-G_WRAP_MODULE_DIR-@"
EXTRA_PATH="${EXTRA_PATH}:@-GNC_GUILE_MODULE_DIR-@"
EXTRA_PATH="${EXTRA_PATH}:@-GNC_SCM_INSTALL_DIR-@"
GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
@@ -16,7 +15,6 @@
EXTRA_LIBS="${GNC_MODULE_PATH}"
EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_LIB_INSTALLDIR-@"
EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_MODULE_DIR-@"
-EXTRA_LIBS="${EXTRA_LIBS}:@-G_WRAP_LIB_DIR-@"
LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
LTDL_LIBRARY_PATH="${EXTRA_LIBS}:${LTDL_LIBRARY_PATH}"
Modified: gnucash/branches/swig-redo/src/bin/gnucash.in
===================================================================
--- gnucash/branches/swig-redo/src/bin/gnucash.in 2006-10-11 20:55:20 UTC (rev 15009)
+++ gnucash/branches/swig-redo/src/bin/gnucash.in 2006-10-11 20:55:52 UTC (rev 15010)
@@ -8,7 +8,6 @@
GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@:${GNC_MODULE_PATH}"
-EXTRA_PATH="@-G_WRAP_MODULE_DIR-@"
EXTRA_PATH="${EXTRA_PATH}:@-GNC_GUILE_MODULE_DIR-@"
EXTRA_PATH="${EXTRA_PATH}:@-GNC_SCM_INSTALL_DIR-@"
GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
@@ -16,7 +15,6 @@
EXTRA_LIBS="${GNC_MODULE_PATH}"
EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_LIB_INSTALLDIR-@"
EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_MODULE_DIR-@"
-EXTRA_LIBS="${EXTRA_LIBS}:@-G_WRAP_LIB_DIR-@"
LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
LTDL_LIBRARY_PATH="${EXTRA_LIBS}:${LTDL_LIBRARY_PATH}"
Modified: gnucash/branches/swig-redo/src/bin/overrides/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/bin/overrides/Makefile.am 2006-10-11 20:55:20 UTC (rev 15009)
+++ gnucash/branches/swig-redo/src/bin/overrides/Makefile.am 2006-10-11 20:55:52 UTC (rev 15010)
@@ -31,8 +31,6 @@
gnucash-env: gnucash-env.in ${top_builddir}/config.status Makefile
rm -f $@.tmp
sed < $< > $@.tmp \
- -e 's:@-G_WRAP_MODULE_DIR-@:${G_WRAP_MODULE_DIR}:g' \
- -e 's:@-G_WRAP_LIB_DIR-@:${G_WRAP_LIB_DIR}:g' \
-e 's:@-GNC_GUILE_MODULE_DIR-@:${GNC_SHAREDIR}/guile-modules:g' \
-e 's:@-GNC_SCM_INSTALL_DIR-@:${GNC_SCM_INSTALL_DIR}:g' \
-e 's:@-GNC_LIB_INSTALLDIR-@:${libdir}:' \
@@ -47,8 +45,6 @@
rm -f $@.tmp
sed < $< > $@.tmp \
-e 's:@-GNC_TEST_SRFI_LOAD_CMD-@:@GNC_TEST_SRFI_LOAD_CMD@:g' \
- -e 's:@-G_WRAP_MODULE_DIR-@:${G_WRAP_MODULE_DIR}:g' \
- -e 's:@-G_WRAP_LIB_DIR-@:${G_WRAP_LIB_DIR}:g' \
-e 's:@-GNC_BUILDDIR-@:${PWD}/${top_builddir}:g' \
-e 's:@-GNC_SRCDIR-@:${PWD}/${top_srcdir}:g'
mv $@.tmp $@
Modified: gnucash/branches/swig-redo/src/bin/overrides/gnucash-build-env.in
===================================================================
--- gnucash/branches/swig-redo/src/bin/overrides/gnucash-build-env.in 2006-10-11 20:55:20 UTC (rev 15009)
+++ gnucash/branches/swig-redo/src/bin/overrides/gnucash-build-env.in 2006-10-11 20:55:52 UTC (rev 15010)
@@ -10,8 +10,6 @@
top_srcdir="@-GNC_SRCDIR-@"
top_builddir="@-GNC_BUILDDIR-@"
-G_WRAP_MODULE_DIR="@-G_WRAP_MODULE_DIR-@"
-G_WRAP_LIB_DIR="@-G_WRAP_LIB_DIR-@"
if test "${GNC_CONFIG_PATH}"x = x
then
@@ -33,8 +31,6 @@
eval `@-GNC_SRCDIR-@/src/gnc-test-env @-GNC_TEST_SRFI_LOAD_CMD-@ \
--library-dir ${top_builddir}/src/gnome \
- --library-dir ${G_WRAP_LIB_DIR} \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
--guile-load-dir ${top_builddir}/src/scm \
--guile-load-dir ${top_builddir}/lib/guile-www \
--guile-load-dir ${top_builddir}/src/gnome \
Modified: gnucash/branches/swig-redo/src/bin/overrides/gnucash-env.in
===================================================================
--- gnucash/branches/swig-redo/src/bin/overrides/gnucash-env.in 2006-10-11 20:55:20 UTC (rev 15009)
+++ gnucash/branches/swig-redo/src/bin/overrides/gnucash-env.in 2006-10-11 20:55:52 UTC (rev 15010)
@@ -6,7 +6,6 @@
GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@:${GNC_MODULE_PATH}"
-EXTRA_PATH="@-G_WRAP_MODULE_DIR-@"
EXTRA_PATH="${EXTRA_PATH}:@-GNC_GUILE_MODULE_DIR-@"
EXTRA_PATH="${EXTRA_PATH}:@-GNC_SCM_INSTALL_DIR-@"
@@ -15,7 +14,6 @@
EXTRA_LIBS="${GNC_MODULE_PATH}"
EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_LIB_INSTALLDIR-@"
EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_MODULE_DIR-@"
-EXTRA_LIBS="${EXTRA_LIBS}:@-G_WRAP_LIB_DIR-@"
LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
LTDL_LIBRARY_PATH="${EXTRA_LIBS}:${LTDL_LIBRARY_PATH}"
Modified: gnucash/branches/swig-redo/src/engine/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/engine/Makefile.am 2006-10-11 20:55:20 UTC (rev 15009)
+++ gnucash/branches/swig-redo/src/engine/Makefile.am 2006-10-11 20:55:52 UTC (rev 15010)
@@ -148,9 +148,8 @@
endif
.scm-links:
- rm -f gnucash g-wrapped
+ rm -f gnucash
$(LN_S) -f . gnucash
- $(LN_S) -f . g-wrapped
if GNUCASH_SEPARATE_BUILDDIR
for X in ${SCM_FILE_LINKS} ; do \
$(LN_S) -f ${srcdir}/$$X . ; \
Modified: gnucash/branches/swig-redo/src/gnome/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/gnome/Makefile.am 2006-10-11 20:55:20 UTC (rev 15009)
+++ gnucash/branches/swig-redo/src/gnome/Makefile.am 2006-10-11 20:55:52 UTC (rev 15010)
@@ -103,7 +103,6 @@
-I${top_srcdir}/src/network-utils \
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/backend/file \
- -I${top_srcdir}/src/g-wrap \
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/gnome-search \
-I${top_srcdir}/src/register/ledger-core \
Modified: gnucash/branches/swig-redo/src/import-export/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/import-export/Makefile.am 2006-10-11 20:55:20 UTC (rev 15009)
+++ gnucash/branches/swig-redo/src/import-export/Makefile.am 2006-10-11 20:55:52 UTC (rev 15010)
@@ -85,11 +85,10 @@
noinst_DATA = .scm-links
.scm-links:
- rm -f g-wrapped gnucash generic-import import-export
+ rm -f gnucash generic-import import-export
$(LN_S) -f . import-export
$(LN_S) -f . gnucash
$(LN_S) -f . generic-import
- $(LN_S) -f . g-wrapped
if GNUCASH_SEPARATE_BUILDDIR
for X in ${SCM_FILE_LINKS} ; do \
$(LN_S) -f ${srcdir}/$$X . ; \
@@ -97,5 +96,5 @@
endif
touch .scm-links
-CLEANFILES = gnucash generic-import g-wrapped .scm-links import-export
+CLEANFILES = gnucash generic-import .scm-links import-export
DISTCLEANFILES = ${SCM_FILE_LINKS}
Modified: gnucash/branches/swig-redo/src/import-export/log-replay/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/import-export/log-replay/Makefile.am 2006-10-11 20:55:20 UTC (rev 15009)
+++ gnucash/branches/swig-redo/src/import-export/log-replay/Makefile.am 2006-10-11 20:55:52 UTC (rev 15010)
@@ -39,5 +39,3 @@
uidir = $(GNC_UI_DIR)
dist_ui_DATA = \
gnc-plugin-log-replay-ui.xml
-
-CLEANFILES = g-wrapped
Modified: gnucash/branches/swig-redo/src/import-export/qif-import/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/Makefile.am 2006-10-11 20:55:20 UTC (rev 15009)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/Makefile.am 2006-10-11 20:55:52 UTC (rev 15010)
@@ -87,11 +87,10 @@
noinst_DATA = .scm-links
.scm-links:
- rm -f g-wrapped gnucash import-export qif-import
+ rm -f gnucash import-export qif-import
$(LN_S) -f . qif-import # to fix (load "qif-import/foo.scm")
$(LN_S) -f . import-export
$(LN_S) -f . gnucash
- $(LN_S) -f . g-wrapped
if GNUCASH_SEPARATE_BUILDDIR
for X in ${SCM_FILE_LINKS} ; do \
$(LN_S) -f ${srcdir}/$$X . ; \
@@ -99,5 +98,5 @@
endif
touch .scm-links
-CLEANFILES += qif-import import-export gnucash g-wrapped .scm-links
+CLEANFILES += qif-import import-export gnucash .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
More information about the gnucash-changes
mailing list