summaryrefslogtreecommitdiffstats
path: root/php
diff options
context:
space:
mode:
authorBenjamin Dauvergne <bdauvergne@entrouvert.com>2008-05-26 22:58:38 +0000
committerBenjamin Dauvergne <bdauvergne@entrouvert.com>2008-05-26 22:58:38 +0000
commitdab2625c95627db39ea62cbb86508e1bd408ecde (patch)
tree7512b540ab37b8702764c403b25462190f9bdea3 /php
parent477c0dbd7d48d3380a75095b6ba346302d8da9f6 (diff)
downloadlasso-dab2625c95627db39ea62cbb86508e1bd408ecde.tar.gz
lasso-dab2625c95627db39ea62cbb86508e1bd408ecde.tar.xz
lasso-dab2625c95627db39ea62cbb86508e1bd408ecde.zip
fix INCLUDES, remove obsolete JDK_INCLUDES definition
Diffstat (limited to 'php')
-rw-r--r--php/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/php/Makefile.am b/php/Makefile.am
index d9b49a36..831bf319 100644
--- a/php/Makefile.am
+++ b/php/Makefile.am
@@ -1,7 +1,7 @@
SWIG_OUTPUTS = lasso_wrap.c php_lasso.h lasso.php
php_extension_LTLIBRARIES = lasso.la
-lasso_la_CFLAGS = $(LASSO_CORE_CFLAGS) -I$(top_srcdir) -I$(top_builddir) $(PHP4_INCLUDES)
+lasso_la_CFLAGS = $(LASSO_CORE_CFLAGS) -I$(top_builddir) -I$(top_srcdir) $(PHP4_INCLUDES)
lasso_la_LDFLAGS = -export-dynamic -prefer-pic -module -avoid-version
lasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) $(PHP4_LDFLAGS)
lasso_la_SOURCES = lasso_wrap.c
@@ -10,7 +10,7 @@ php_extensiondir = ${prefix}@PHP4_UNPREFIXED_EXTENSION_DIR@
SWIG_I_FILES=$(shell find $(top_srcdir)/swig/ -name '*.[ih]')
lasso_wrap.c php_lasso.h lasso.php: $(SWIG_I_FILES)
- $(SWIG) -v -php4 -module lasso -o lasso_wrap.c $(top_srcdir)/swig/Lasso.i
+ $(SWIG) -I$(top_builddir)/swig -v -php4 -module lasso -o lasso_wrap.c $(top_srcdir)/swig/Lasso.i
cp lasso_wrap.c lasso_wrap.c.bak
test x"$(SWIG)" = xecho || \
$(PYTHON) $(srcdir)/patch_swig_output.py < lasso_wrap.c.bak > lasso_wrap.c