fix INCLUDES, remove obsolete JDK_INCLUDES definition

5 files changed, 14 insertions, 14 deletions

diff --git a/java/Makefile.am b/java/Makefile.am
index e843373c..7ae408b0 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -1,6 +1,5 @@
 # Define java Package directory, the tailing '/' is mandatory.
 JAVA_PATH = com/entrouvert/lasso/
-JDK_INCLUDES = @JDK_INCLUDE@ -I$(top_builddir)
 CLASSPATH = .
 
 javalibdir = $(prefix)/lib/java
@@ -14,13 +13,13 @@ javalib_LTLIBRARIES = libjlasso.la
 endif
 
 jlasso_la_SOURCES =	lasso_wrap.c
-jlasso_la_CFLAGS = -fno-strict-aliasing $(JAVA_INCLUDE) $(LASSO_CORE_CFLAGS) -I$(top_srcdir)
+jlasso_la_CFLAGS = -fno-strict-aliasing $(JAVA_INCLUDE) $(LASSO_CORE_CFLAGS) -I$(top_builddir) -I$(top_srcdir)
 jlasso_la_LIBADD =	$(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
 jlasso_la_LDFLAGS =	-no-undefined -avoid-version -module \
                         -Wl,--add-stdcall-alias 
 
 libjlasso_la_SOURCES =	lasso_wrap.c
-libjlasso_la_CFLAGS = -fno-strict-aliasing $(JAVA_INCLUDE) $(LASSO_CORE_CFLAGS) -I$(top_srcdir)
+libjlasso_la_CFLAGS = -fno-strict-aliasing $(JAVA_INCLUDE) $(LASSO_CORE_CFLAGS) -I$(top_builddir) -I$(top_srcdir)
 libjlasso_la_LIBADD =	$(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
 libjlasso_la_LDFLAGS =	-no-undefined -avoid-version -module
 
diff --git a/perl/Makefile.am b/perl/Makefile.am
index 406d3a0a..22475025 100644
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -1,6 +1,6 @@
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 
-AM_CPPFLAGS=@CPPFLAGS@ -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/lasso @LASSO_CFLAGS@
+AM_CPPFLAGS=@CPPFLAGS@ -I$(top_builddir) -I$(top_srcdir) @LASSO_CFLAGS@
 AM_CFLAGS=@CFLAGS@ @LASSO_CORE_CFLAGS@
 AM_STANDARD_CFLAGS=@LASSO_CORE_CFLAGS@
 
@@ -16,12 +16,12 @@ fake_DATA=build-perl-stamp
 
 SWIG_I_FILES=$(shell find $(top_srcdir)/swig/ -name '*.[ih]')
 lasso_wrap.c lasso.pm: $(SWIG_I_FILES)
-	$(SWIG) -v -perl5 -module lasso -o lasso_wrap.c $(top_srcdir)/swig/Lasso.i
+	$(SWIG) -I$(top_builddir)/swig -v -perl5 -module lasso -o lasso_wrap.c $(top_srcdir)/swig/Lasso.i
 
-$(PERL_MAKEFILE): lasso.pm
-	test -e Makefile.PL || $(LN_S) $(srcdir)/Makefile.PL .
-	test -e lasso_wrap.c || $(LN_S) $(srcdir)/lasso_wrap.c .
-	test -e lasso.pm || $(LN_S) $(srcdir)/lasso.pm .
+$(PERL_MAKEFILE): lasso.pm lasso_wrap.c
+	test -e Makefile.PL || test ! -e $(srcdir)/Makefile.PL || $(LN_S) $(srcdir)/Makefile.PL .
+	test -e lasso_wrap.c || test ! -e $(srcdir)/lasso_wrap.c || $(LN_S) $(srcdir)/lasso_wrap.c .
+	test -e lasso.pm || test ! -e $(srcdir)/lasso.pm || $(LN_S) $(srcdir)/lasso.pm .
 	VERSION=$(VERSION) CC=$(CC) CFLAGS="$(AM_CPPFLAGS) $(AM_CFLAGS) $(SWIG_OPTS) $(CPPFLAGS) $(AM_STANDARD_CFLAGS)" $(PERL) $(srcdir)/Makefile.PL DESTDIR=$(DESTDIR) PREFIX=$(prefix) $(MAKE_PL_OPTS)
 
 -perl install-perl: $(PERL_MAKEFILE)
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
diff --git a/php5/Makefile.am b/php5/Makefile.am
index 96e8d32d..151de566 100644
--- a/php5/Makefile.am
+++ b/php5/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) $(PHP5_INCLUDES)
+lasso_la_CFLAGS = $(LASSO_CORE_CFLAGS) -I$(top_builddir) -I$(top_srcdir) $(PHP5_INCLUDES)
 lasso_la_LDFLAGS = -export-dynamic -prefer-pic -module -avoid-version
 lasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) $(PHP5_LDFLAGS)
 lasso_la_SOURCES = lasso_wrap.c
diff --git a/python/Makefile.am b/python/Makefile.am
index 82d4fdd7..703187b8 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,5 +1,6 @@
-INCLUDES = -I$(top_srcdir) \
+INCLUDES = \
 	-I$(top_builddir) \
+	-I$(top_srcdir) \
 	$(SASL_CFLAGS)
 
 pythondir= $(PY_SITE_PACKAGES)