summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Dauvergne <bdauvergne@entrouvert.com>2008-05-26 22:58:21 +0000
committerBenjamin Dauvergne <bdauvergne@entrouvert.com>2008-05-26 22:58:21 +0000
commit67db74d9d8ffcc8f7998f354d845d57c6fca642c (patch)
tree05076e5c3ce864af345502ff1f2e3480fdaf37fe
parent1be04df84e8f2a1d2feed164ca2214b5a953864f (diff)
downloadlasso-67db74d9d8ffcc8f7998f354d845d57c6fca642c.tar.gz
lasso-67db74d9d8ffcc8f7998f354d845d57c6fca642c.tar.xz
lasso-67db74d9d8ffcc8f7998f354d845d57c6fca642c.zip
cleanup include listingm first builddir then srcdir and no need for $srcdir/lasso
-rw-r--r--lasso/Makefile.am2
-rw-r--r--lasso/id-ff/Makefile.am3
-rw-r--r--lasso/id-wsf-2.0/Makefile.am3
-rw-r--r--lasso/id-wsf/Makefile.am3
-rw-r--r--lasso/saml-2.0/Makefile.am3
-rw-r--r--lasso/xml/Makefile.am2
-rw-r--r--lasso/xml/id-wsf-2.0/Makefile.am2
-rw-r--r--lasso/xml/saml-2.0/Makefile.am2
-rw-r--r--lasso/xml/ws/Makefile.am2
9 files changed, 9 insertions, 13 deletions
diff --git a/lasso/Makefile.am b/lasso/Makefile.am
index 9199336f..8d5d7084 100644
--- a/lasso/Makefile.am
+++ b/lasso/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = xml id-ff id-wsf saml-2.0 id-wsf-2.0
liblassoincludedir = $(includedir)/lasso
-INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(LASSO_CORE_CFLAGS)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(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 43c6cb48..25dcce9f 100644
--- a/lasso/id-ff/Makefile.am
+++ b/lasso/id-ff/Makefile.am
@@ -1,9 +1,8 @@
liblassoincludedir = $(includedir)/lasso/id-ff
INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/lasso \
-I$(top_builddir) \
+ -I$(top_srcdir) \
$(LASSO_CORE_CFLAGS) \
-DG_LOG_DOMAIN=\"lasso\"
diff --git a/lasso/id-wsf-2.0/Makefile.am b/lasso/id-wsf-2.0/Makefile.am
index c9cf4ca7..062f8854 100644
--- a/lasso/id-wsf-2.0/Makefile.am
+++ b/lasso/id-wsf-2.0/Makefile.am
@@ -1,9 +1,8 @@
liblassoincludedir = $(includedir)/lasso/id-wsf-2.0
INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/lasso \
-I$(top_builddir) \
+ -I$(top_srcdir) \
$(LASSO_CORE_CFLAGS) \
-DG_LOG_DOMAIN=\"lasso\"
diff --git a/lasso/id-wsf/Makefile.am b/lasso/id-wsf/Makefile.am
index a919a127..fa64e733 100644
--- a/lasso/id-wsf/Makefile.am
+++ b/lasso/id-wsf/Makefile.am
@@ -1,9 +1,8 @@
liblassoincludedir = $(includedir)/lasso/id-wsf
INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/lasso \
-I$(top_builddir) \
+ -I$(top_srcdir) \
$(LASSO_CORE_CFLAGS) \
-DG_LOG_DOMAIN=\"lasso\"
diff --git a/lasso/saml-2.0/Makefile.am b/lasso/saml-2.0/Makefile.am
index 7b4426f1..6182d1cd 100644
--- a/lasso/saml-2.0/Makefile.am
+++ b/lasso/saml-2.0/Makefile.am
@@ -1,9 +1,8 @@
liblassoincludedir = $(includedir)/lasso/saml-2.0
INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/lasso \
-I$(top_builddir) \
+ -I$(top_srcdir) \
$(LASSO_CORE_CFLAGS) \
-DG_LOG_DOMAIN=\"lasso\"
diff --git a/lasso/xml/Makefile.am b/lasso/xml/Makefile.am
index 079b2baa..34d9d080 100644
--- a/lasso/xml/Makefile.am
+++ b/lasso/xml/Makefile.am
@@ -3,8 +3,8 @@ SUBDIRS = saml-2.0 id-wsf-2.0 ws
liblassoincludedir = $(includedir)/lasso/xml
INCLUDES = \
+ -I$(top_builddir) \
-I$(top_srcdir) \
- -I$(top_srcdir)/lasso \
$(LASSO_CORE_CFLAGS) \
-DG_LOG_DOMAIN=\"lasso\"
diff --git a/lasso/xml/id-wsf-2.0/Makefile.am b/lasso/xml/id-wsf-2.0/Makefile.am
index 8205a5f3..b31e56a7 100644
--- a/lasso/xml/id-wsf-2.0/Makefile.am
+++ b/lasso/xml/id-wsf-2.0/Makefile.am
@@ -1,8 +1,8 @@
liblassoincludedir = $(includedir)/lasso/xml/id-wsf-2.0
INCLUDES = \
+ -I$(top_builddir) \
-I$(top_srcdir) \
- -I$(top_srcdir)/lasso \
$(LASSO_CORE_CFLAGS) \
-DG_LOG_DOMAIN=\"lasso\"
diff --git a/lasso/xml/saml-2.0/Makefile.am b/lasso/xml/saml-2.0/Makefile.am
index d3c4775c..da7316ae 100644
--- a/lasso/xml/saml-2.0/Makefile.am
+++ b/lasso/xml/saml-2.0/Makefile.am
@@ -1,8 +1,8 @@
liblassoincludedir = $(includedir)/lasso/xml/saml-2.0
INCLUDES = \
+ -I$(top_builddir) \
-I$(top_srcdir) \
- -I$(top_srcdir)/lasso \
$(LASSO_CORE_CFLAGS) \
-DG_LOG_DOMAIN=\"lasso\"
diff --git a/lasso/xml/ws/Makefile.am b/lasso/xml/ws/Makefile.am
index 4b44a354..32e31c5f 100644
--- a/lasso/xml/ws/Makefile.am
+++ b/lasso/xml/ws/Makefile.am
@@ -1,8 +1,8 @@
liblassoincludedir = $(includedir)/lasso/xml/ws
INCLUDES = \
+ -I$(top_builddir) \
-I$(top_srcdir) \
- -I$(top_srcdir)/lasso \
$(LASSO_CORE_CFLAGS) \
-DG_LOG_DOMAIN=\"lasso\"