aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-09-10 23:46:17 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-09-10 23:46:17 +0000
commit60466ee8c9f73f0d7928724d8e6594baaf1d4d45 (patch)
tree8d0908faeaeea3f4c9304c165375247413b18e0f
parent34ee3dca4cdcbce677e5c299c8090c1189a4bff4 (diff)
downloadpaludis-60466ee8c9f73f0d7928724d8e6594baaf1d4d45.tar.gz
paludis-60466ee8c9f73f0d7928724d8e6594baaf1d4d45.tar.xz
Fix python hooks
-rw-r--r--paludis/Makefile.am.m49
1 files changed, 7 insertions, 2 deletions
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 1760f2f..e83fced 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -89,8 +89,12 @@ libpaludis_la_SOURCES = filelist
libpaludis_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 $(PTHREAD_LIBS)
libpaludispythonhooks_la_SOURCES = python_hooks.cc
-libpaludispythonhooks_la_CXXFLAGS = $(AM_CXXFLAGS) -I@PYTHON_INCLUDE_DIR@
+libpaludispythonhooks_la_CXXFLAGS = $(AM_CXXFLAGS) \
+ @PALUDIS_CXXFLAGS_NO_STRICT_ALIASING@ \
+ @PALUDIS_CXXFLAGS_NO_WSHADOW@ \
+ -I@PYTHON_INCLUDE_DIR@
libpaludispythonhooks_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 @BOOST_PYTHON_LIB@ -lpython@PYTHON_VERSION@
+libpaludispythonhooks_la_LIBADD = $(top_builddir)/paludis/libpaludis.la
libpaludismanpagethings_la_SOURCES = name.cc
@@ -170,6 +174,7 @@ TESTS_ENVIRONMENT = env \
PYTHONPATH="$(top_builddir)/python/" \
PALUDIS_PYTHON_DIR="$(top_srcdir)/python/" \
LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs/`" \
+ $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs/ \
+ `:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/python/.libs/`" \
bash $(top_srcdir)/test/run_test.sh