gnucash unstable: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Thu Nov 30 16:33:13 EST 2017
Updated via https://github.com/Gnucash/gnucash/commit/4a84fca9 (commit)
via https://github.com/Gnucash/gnucash/commit/5ca129d8 (commit)
from https://github.com/Gnucash/gnucash/commit/649a6a26 (commit)
commit 4a84fca9b1867636e82243e937ecf205c81fdfff
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Nov 30 13:32:57 2017 -0800
Add GLIB_CFLAGS and srcdir to SWIG includes.
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 06e8e81..1a6c883 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -71,8 +71,9 @@ _gnucash_core_c_includes= \
gnucash_core.c: $(SWIG_FILES) ${top_srcdir}/common/base-typemaps.i ${top_srcdir}/libgnucash/engine/engine-common.i $(_gnucash_core_c_includes)
$(SWIG) -python -Wall -Werror \
- -I$(top_srcdir)/common -I$(top_srcdir)/libgnucash/engine \
- -I$(top_srcdir)/libgnucash/app-utils -o $@ $<
+ -I$(GLIB_CFLAGS) -I$(top_srcdir)/common \
+ -I$(top_srcdir)/libgnucash/engine \
+ -I$(top_srcdir)/libgnucash/app-utils -I${srcdir} -o $@ $<
gnucash_core_c.py: gnucash_core.c $(SWIG_FILES)
endif
commit 5ca129d82d7eb8afef231fe227a7ccecadb59eb0
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Nov 30 13:31:23 2017 -0800
Remove unset variable SWIG_ARGS from Makefile.am
diff --git a/common/test-core/Makefile.am b/common/test-core/Makefile.am
index 0aa560b..30d5a98 100644
--- a/common/test-core/Makefile.am
+++ b/common/test-core/Makefile.am
@@ -25,7 +25,7 @@ libtest_core_la_LDFLAGS = \
if BUILDING_FROM_VCS
swig-unittest-support-guile.c: unittest-support.i $(top_srcdir)/common/base-typemaps.i
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
+ $(SWIG) -guile -Linkage module \
-I${top_srcdir}/common \
${AM_CPPFLAGS} -o $@ $<
if ! OS_WIN32
@@ -37,7 +37,7 @@ endif
endif
swig-unittest-support-python.c: unittest-support.i $(top_srcdir)/common/base-typemaps.i
- $(SWIG) -python -Wall -Werror $(SWIG_ARGS) \
+ $(SWIG) -python -Wall -Werror \
-I${GLIB_CFLAGS} -I${top_srcdir}/common \
${AM_CPPFLAGS} -o $@ $<
diff --git a/gnucash/gnome-utils/Makefile.am b/gnucash/gnome-utils/Makefile.am
index 4cfba43..0692968 100644
--- a/gnucash/gnome-utils/Makefile.am
+++ b/gnucash/gnome-utils/Makefile.am
@@ -220,7 +220,7 @@ gnc-warnings.h: gschemas/org.gnucash.warnings.gschema.xml.in make-gnc-warnings-h
if BUILDING_FROM_VCS
swig-gnome-utils.c: gnome-utils.i \
${top_srcdir}/common/base-typemaps.i
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
+ $(SWIG) -guile -Linkage module \
-I${top_srcdir}/common -o $@ $<
if ! OS_WIN32
if ! SWIG_DIST_FAIL
diff --git a/gnucash/gnome/Makefile.am b/gnucash/gnome/Makefile.am
index e47054e..8fe2b65 100644
--- a/gnucash/gnome/Makefile.am
+++ b/gnucash/gnome/Makefile.am
@@ -150,7 +150,7 @@ noinst_HEADERS = \
if BUILDING_FROM_VCS
swig-gnome.c: gnome.i dialog-progress.h ${top_srcdir}/common/base-typemaps.i
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
+ $(SWIG) -guile -Linkage module \
-I${top_srcdir}/common -o $@ $<
if ! OS_WIN32
if ! SWIG_DIST_FAIL
diff --git a/gnucash/html/Makefile.am b/gnucash/html/Makefile.am
index 9f78dae..db57fd7 100644
--- a/gnucash/html/Makefile.am
+++ b/gnucash/html/Makefile.am
@@ -55,7 +55,7 @@ libgncmod_html_la_LIBADD = \
if BUILDING_FROM_VCS
swig-gnc-html.c: gnc-html.i gnc-html.h \
${top_srcdir}/common/base-typemaps.i
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
+ $(SWIG) -guile -Linkage module \
-I${top_srcdir}/common -o $@ $<
if ! OS_WIN32
if ! SWIG_DIST_FAIL
diff --git a/gnucash/report/report-gnome/Makefile.am b/gnucash/report/report-gnome/Makefile.am
index c52927d..38c11d7 100644
--- a/gnucash/report/report-gnome/Makefile.am
+++ b/gnucash/report/report-gnome/Makefile.am
@@ -49,7 +49,7 @@ libgncmod_report_gnome_la_LIBADD = \
if BUILDING_FROM_VCS
swig-report-gnome.c: report-gnome.i ${top_srcdir}/common/base-typemaps.i
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
+ $(SWIG) -guile -Linkage module \
-I${top_srcdir}/common -o $@ $<
if ! OS_WIN32
if ! SWIG_DIST_FAIL
diff --git a/gnucash/report/report-system/Makefile.am b/gnucash/report/report-system/Makefile.am
index 6673447..0cdeeef 100644
--- a/gnucash/report/report-system/Makefile.am
+++ b/gnucash/report/report-system/Makefile.am
@@ -25,7 +25,7 @@ libgncmod_report_system_la_LIBADD = \
if BUILDING_FROM_VCS
swig-report-system.c: report-system.i ${top_srcdir}/common/base-typemaps.i
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
+ $(SWIG) -guile -Linkage module \
-I${top_srcdir}/common -o $@ $<
if ! OS_WIN32
if ! SWIG_DIST_FAIL
diff --git a/libgnucash/app-utils/Makefile.am b/libgnucash/app-utils/Makefile.am
index 4200b56..84e7f8b 100644
--- a/libgnucash/app-utils/Makefile.am
+++ b/libgnucash/app-utils/Makefile.am
@@ -103,7 +103,7 @@ libgncmod_app_utils_la_LIBADD = \
if BUILDING_FROM_VCS
swig-app-utils-guile.c: app-utils.i ${top_srcdir}/common/base-typemaps.i
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
+ $(SWIG) -guile -Linkage module \
-I${top_srcdir}/common -o $@ $<
if ! OS_WIN32
if ! SWIG_DIST_FAIL
@@ -113,7 +113,7 @@ if ! SWIG_DIST_FAIL
endif
endif
swig-app-utils-python.c: app-utils.i ${top_srcdir}/common/base-typemaps.i
- $(SWIG) -python -Wall -Werror $(SWIG_ARGS) \
+ $(SWIG) -python -Wall -Werror \
-I${GLIB_CFLAGS} -I${top_srcdir}/common -o $@ $<
endif
diff --git a/libgnucash/core-utils/Makefile.am b/libgnucash/core-utils/Makefile.am
index c71072c..da63a34 100644
--- a/libgnucash/core-utils/Makefile.am
+++ b/libgnucash/core-utils/Makefile.am
@@ -40,7 +40,7 @@ noinst_HEADERS = \
if BUILDING_FROM_VCS
swig-core-utils-guile.c: core-utils.i ${top_srcdir}/common/base-typemaps.i
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
+ $(SWIG) -guile -Linkage module \
-I${top_srcdir}/common -o $@ $<
if ! OS_WIN32
if ! SWIG_DIST_FAIL
@@ -50,8 +50,8 @@ if ! SWIG_DIST_FAIL
endif
endif
swig-core-utils-python.c: core-utils.i ${top_srcdir}/common/base-typemaps.i
- $(SWIG) -python -Wall -Werror $(SWIG_ARGS) \
- -I${GLIB_CFLAGS} -I${top_srcdir}/common -o $@ $<
+ $(SWIG) -python -Wall -Werror \
+ -I${GLIB_CFLAGS} -I${top_srcdir}/common -I${srcdir} -o $@ $<
endif
AM_CPPFLAGS = \
diff --git a/libgnucash/engine/Makefile.am b/libgnucash/engine/Makefile.am
index 4943aef..9e4e868 100644
--- a/libgnucash/engine/Makefile.am
+++ b/libgnucash/engine/Makefile.am
@@ -300,7 +300,7 @@ if BUILDING_FROM_VCS
swig-engine.c: engine.i $(top_srcdir)/common/base-typemaps.i \
$(gncinclude_HEADERS) $(noinst_HEADERS)
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
+ $(SWIG) -guile -Linkage module \
-I${top_srcdir}/common -o $@ $<
if ! OS_WIN32
if ! SWIG_DIST_FAIL
diff --git a/libgnucash/gnc-module/Makefile.am b/libgnucash/gnc-module/Makefile.am
index 5701472..9246715 100644
--- a/libgnucash/gnc-module/Makefile.am
+++ b/libgnucash/gnc-module/Makefile.am
@@ -31,7 +31,7 @@ noinst_DATA = .scm-links
if BUILDING_FROM_VCS
swig-gnc-module.c: gnc-module.i ${top_srcdir}/common/base-typemaps.i
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module \
+ $(SWIG) -guile -Linkage module \
-I${top_srcdir}/common -o $@ $<
if ! OS_WIN32
if ! SWIG_DIST_FAIL
diff --git a/libgnucash/gnc-module/test/mod-bar/Makefile.am b/libgnucash/gnc-module/test/mod-bar/Makefile.am
index 9261530..76b158c 100644
--- a/libgnucash/gnc-module/test/mod-bar/Makefile.am
+++ b/libgnucash/gnc-module/test/mod-bar/Makefile.am
@@ -24,7 +24,7 @@ libgncmodbar_la_LIBADD=libbar.la \
if BUILDING_FROM_VCS
swig-bar.c: bar.i
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+ $(SWIG) -guile -Linkage module -o $@ $<
if ! OS_WIN32
if ! SWIG_DIST_FAIL
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
diff --git a/libgnucash/gnc-module/test/mod-baz/Makefile.am b/libgnucash/gnc-module/test/mod-baz/Makefile.am
index 6914f93..b5d1064 100644
--- a/libgnucash/gnc-module/test/mod-baz/Makefile.am
+++ b/libgnucash/gnc-module/test/mod-baz/Makefile.am
@@ -28,7 +28,7 @@ libgncmodbaz_la_LIBADD = \
if BUILDING_FROM_VCS
swig-baz.c: baz.i
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+ $(SWIG) -guile -Linkage module -o $@ $<
if ! OS_WIN32
if ! SWIG_DIST_FAIL
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
diff --git a/libgnucash/gnc-module/test/mod-foo/Makefile.am b/libgnucash/gnc-module/test/mod-foo/Makefile.am
index bc92a3e..a1536f4 100644
--- a/libgnucash/gnc-module/test/mod-foo/Makefile.am
+++ b/libgnucash/gnc-module/test/mod-foo/Makefile.am
@@ -30,7 +30,7 @@ EXTRA_DIST = \
if BUILDING_FROM_VCS
swig-foo.c: foo.i
- $(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+ $(SWIG) -guile -Linkage module -o $@ $<
if ! OS_WIN32
if ! SWIG_DIST_FAIL
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
Summary of changes:
bindings/python/Makefile.am | 5 +++--
common/test-core/Makefile.am | 4 ++--
gnucash/gnome-utils/Makefile.am | 2 +-
gnucash/gnome/Makefile.am | 2 +-
gnucash/html/Makefile.am | 2 +-
gnucash/report/report-gnome/Makefile.am | 2 +-
gnucash/report/report-system/Makefile.am | 2 +-
libgnucash/app-utils/Makefile.am | 4 ++--
libgnucash/core-utils/Makefile.am | 6 +++---
libgnucash/engine/Makefile.am | 2 +-
libgnucash/gnc-module/Makefile.am | 2 +-
libgnucash/gnc-module/test/mod-bar/Makefile.am | 2 +-
libgnucash/gnc-module/test/mod-baz/Makefile.am | 2 +-
libgnucash/gnc-module/test/mod-foo/Makefile.am | 2 +-
14 files changed, 20 insertions(+), 19 deletions(-)
More information about the gnucash-changes
mailing list