diff options
| -rw-r--r-- | java/Makefile.am | 2 | ||||
| -rw-r--r-- | lasso/Makefile.am | 2 | ||||
| -rw-r--r-- | lasso/id-ff/Makefile.am | 1 | ||||
| -rw-r--r-- | lasso/saml-2.0/Makefile.am | 1 | ||||
| -rw-r--r-- | perl/Makefile.am | 2 | ||||
| -rw-r--r-- | php/Makefile.am | 2 | ||||
| -rw-r--r-- | python/Makefile.am | 1 |
7 files changed, 7 insertions, 4 deletions
diff --git a/java/Makefile.am b/java/Makefile.am index 3d2ddfc5..ff06dfbb 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -1,6 +1,6 @@ # Define java Package directory, the tailing '/' is mandatory. JAVA_PATH = com/entrouvert/lasso/ -JDK_INCLUDES = @JDK_INCLUDE@ +JDK_INCLUDES = @JDK_INCLUDE@ -I$(top_builddir) CLASSPATH = . javalibdir = $(prefix)/lib/java diff --git a/lasso/Makefile.am b/lasso/Makefile.am index bead20ea..7f443058 100644 --- a/lasso/Makefile.am +++ b/lasso/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = xml id-ff id-wsf saml-2.0 liblassoincludedir = $(includedir)/lasso -INCLUDES = -I$(top_srcdir) $(LASSO_CORE_CFLAGS) +INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(LASSO_CORE_CFLAGS) ## Added to activate libtool 1.5.6 windows resources partial support LTRCCOMPILE = $(LIBTOOL) --tag=RC --mode=compile $(RC) \ diff --git a/lasso/id-ff/Makefile.am b/lasso/id-ff/Makefile.am index 3f33baaa..917507a0 100644 --- a/lasso/id-ff/Makefile.am +++ b/lasso/id-ff/Makefile.am @@ -3,6 +3,7 @@ liblassoincludedir = $(includedir)/lasso/id-ff INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/lasso \ + -I$(top_builddir) \ $(LASSO_CORE_CFLAGS) \ -DG_LOG_DOMAIN=\"lasso\" diff --git a/lasso/saml-2.0/Makefile.am b/lasso/saml-2.0/Makefile.am index ccd913ab..7f38fc95 100644 --- a/lasso/saml-2.0/Makefile.am +++ b/lasso/saml-2.0/Makefile.am @@ -3,6 +3,7 @@ liblassoincludedir = $(includedir)/lasso/saml-2.0 INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/lasso \ + -I$(top_builddir) \ $(LASSO_CORE_CFLAGS) \ -DG_LOG_DOMAIN=\"lasso\" diff --git a/perl/Makefile.am b/perl/Makefile.am index 5e080607..406d3a0a 100644 --- a/perl/Makefile.am +++ b/perl/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(top_srcdir) -AM_CPPFLAGS=@CPPFLAGS@ -I$(top_srcdir) -I$(top_builddir)/lasso @LASSO_CFLAGS@ +AM_CPPFLAGS=@CPPFLAGS@ -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/lasso @LASSO_CFLAGS@ AM_CFLAGS=@CFLAGS@ @LASSO_CORE_CFLAGS@ AM_STANDARD_CFLAGS=@LASSO_CORE_CFLAGS@ diff --git a/php/Makefile.am b/php/Makefile.am index e6d6eab1..d0936003 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) $(PHP_INCLUDES) +lasso_la_CFLAGS = $(LASSO_CORE_CFLAGS) -I$(top_srcdir) -I$(top_builddir) $(PHP_INCLUDES) lasso_la_LDFLAGS = -export-dynamic -prefer-pic -module -avoid-version lasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) $(PHP_LDFLAGS) lasso_la_SOURCES = lasso_wrap.c diff --git a/python/Makefile.am b/python/Makefile.am index 42399c59..82d4fdd7 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -1,4 +1,5 @@ INCLUDES = -I$(top_srcdir) \ + -I$(top_builddir) \ $(SASL_CFLAGS) pythondir= $(PY_SITE_PACKAGES) |