[glom/glom-1-28] Makefile*.am: Use PYTHON_LIBS instead of PYTHON_LDFLAGS.



commit 182e378ceb87777c1d75492813038678c302e188
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 20 10:50:22 2015 +0200

    Makefile*.am: Use PYTHON_LIBS instead of PYTHON_LDFLAGS.
    
    Because that is what AX_PYTHON_DEVEL now provides.

 Makefile_libglom.am |    2 +-
 Makefile_tests.am   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/Makefile_libglom.am b/Makefile_libglom.am
index f02923d..edc8e9a 100644
--- a/Makefile_libglom.am
+++ b/Makefile_libglom.am
@@ -33,7 +33,7 @@ include $(top_srcdir)/glom/libglom/filelist.am
 # so we must assume that they are at the top of /usr/include,
 # or at least next to the python headers.
 boost_python_cflags = $(PYTHON_CPPFLAGS)
-boost_python_libs = $(PYTHON_LDFLAGS) $(PYTHON_EXTRA_LDFLAGS) -l$(BOOST_PYTHON_LIB)
+boost_python_libs = $(PYTHON_LIBS) $(PYTHON_EXTRA_LDFLAGS) -l$(BOOST_PYTHON_LIB)
 
 libglom_includedir = $(includedir)/glom-$(GLOM_ABI_VERSION)/libglom
 libglom_include_HEADERS = $(libglom_toplevel_headers)
diff --git a/Makefile_tests.am b/Makefile_tests.am
index 6e2cb9b..e8328b1 100644
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@ -202,7 +202,7 @@ tests_python_test_load_python_library_LDADD = $(LIBGLOM_LIBS) $(DL_LIB)
 tests_python_test_load_python_library_CPPFLAGS = $(tests_cppflags)
 
 tests_python_test_python_module_SOURCES = tests/python/test_python_module.cc
-tests_python_test_python_module_LDADD = $(tests_ldadd) $(PYTHON_LDFLAGS)
+tests_python_test_python_module_LDADD = $(tests_ldadd) $(PYTHON_LIBS)
 tests_python_test_python_module_CPPFLAGS = $(tests_cppflags)
 
 
@@ -491,7 +491,7 @@ tests_glade_toplevels_instantiation_LDADD = $(tests_ldadd) $(GLOM_LIBS)
 tests_glade_toplevels_instantiation_CPPFLAGS = $(tests_cppflags_ui)
 
 glom_test_pyembed_SOURCES = glom/test_pyembed.cc
-glom_test_pyembed_LDADD = $(LIBGLOM_LIBS) $(PYTHON_LDFLAGS)
+glom_test_pyembed_LDADD = $(LIBGLOM_LIBS) $(PYTHON_LIBS)
 glom_test_pyembed_CPPFLAGS = $(tests_cppflags_ui)
 
 endif #GLOM_ENABLE_UI


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]