summaryrefslogtreecommitdiffstats
path: root/perl
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 /perl
parent477c0dbd7d48d3380a75095b6ba346302d8da9f6 (diff)
downloadlasso-dab2625c95627db39ea62cbb86508e1bd408ecde.tar.gz
lasso-dab2625c95627db39ea62cbb86508e1bd408ecde.tar.xz
lasso-dab2625c95627db39ea62cbb86508e1bd408ecde.zip
fix INCLUDES, remove obsolete JDK_INCLUDES definition
Diffstat (limited to 'perl')
-rw-r--r--perl/Makefile.am14
1 files changed, 7 insertions, 7 deletions
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)