things were overcomplicated; simplify a bit (for example the DEPDIR dirty

things was necessary because variables were overused; ask me for details if you
want)

4 files changed, 41 insertions, 116 deletions

diff --git a/configure.ac b/configure.ac
index 4234bdec..391487b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,15 +86,14 @@ dnl
 dnl Check for programs
 dnl
 AC_PROG_CC
+AC_HEADER_STDC
 LT_AC_PROG_RC
 AM_PROG_GCJ
 AC_EXEEXT
 AC_PROG_CC_C_O
 AM_SANITY_CHECK
-dnl AC_PROG_AWK dnl Waiting if we really need it.
+AC_PROG_AWK
 AC_PROG_LN_S
-AC_PROG_EGREP
-AC_PROG_RANLIB
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
@@ -102,13 +101,9 @@ AC_SUBST(LIBTOOL_DEPS)
 dnl Find tar command for make dist
 AC_CHECK_PROGS(TAR, gnutar gtar tar)
 
-dnl Find egrep command.
-dnl AC_CHECK_PROGS(EGREP, egrep)
-
 dnl Check existence of binding programs
 AC_CHECK_PROGS(JAVA, java)
 AC_CHECK_PROGS(JAVAC, gcj javac)
-dnl AC_CHECK_PROGS(JAVAH, gcjh javah) dnl Not used with SWIG.
 AC_CHECK_PROGS(JAR, fastjar jar)
 AC_CHECK_PROGS(PYTHON, python)
 AC_CHECK_PROGS(PHP, php)
@@ -116,7 +111,6 @@ AC_PATH_PROGS(PHP_PATH, php)
 AC_CHECK_PROG(PHP_CONFIG, php-config, php-config)
 AC_CHECK_PROGS(SWIG, swig)
 
-
 LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[^_].*"'
 
 dnl Make sure we have an ANSI compiler
@@ -209,14 +203,12 @@ AC_ARG_ENABLE(java, [  --disable-java          disable the Java bindings],,
               enable_java="yes")
 AC_ARG_WITH(java-home,
             [  --with-java-home=(JAVA_HOME)  set the full path to the java home directory.])
-AC_MSG_CHECKING(for Java)
 JAVAC_FLAGS=
 JDK_INCLUDE=
 SUN=no
 if test "X$with_java_home" != X; then
     JDK_INCLUDE="$with_java_home/include"
 fi
-dnl JAVAH_FLAGS= dnl Not used with SWIG
 
 dnl If the java compiler seems to be a Sun JDK-like compile (Kaffe, Sun JDK...)
 if test "x$JAVA" = "xjava" && test "x$JAVAC" = "xjavac"; then
@@ -273,11 +265,9 @@ fi
 
 dnl Conditional java sub dir test.
 AM_CONDITIONAL([JAVA_ENABLED],[test "x$enable_java" = "xyes"])
-AC_MSG_RESULT($enable_java)
 AC_SUBST(JAVA_VERSION)
 AC_SUBST(JAVAC_FLAGS)
 AC_SUBST(JDK_INCLUDE)
-dnl AC_SUBST(JAVAH_FLAGS) dnl Not used with SWIG
 
 
 dnl ==========================================================================
@@ -500,6 +490,7 @@ AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
 AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 
+
 dnl ==========================================================================
 dnl User specific option.
 dnl ==========================================================================
@@ -549,21 +540,6 @@ if test "x$enable_gtk_doc" = "xyes" ; then
 fi
 dnl Conditional docs sub dir test.
 AM_CONDITIONAL([GTK_DOC_ENABLED],[test "x$enable_gtk_doc" = "xyes"])
-AC_MSG_RESULT($enable_gtk_doc)
-
-
-dnl ==========================================================================
-dnl check do we have size_t and its size, 
-dnl TODO: will need to replace this and the lassoSize define with 
-dnl typedef on next ABI refresh
-dnl ==========================================================================
-AC_CHECK_SIZEOF(size_t)
-if test "$ac_cv_sizeof_size_t" -ne "4" ; then
-    LASSO_DEFINES="$LASSO_DEFINES -DLASSO_NO_SIZE_T"
-fi
-
-dnl Checks for header files.
-AC_HEADER_STDC
 
 
 dnl Debug 
@@ -593,7 +569,6 @@ dnl ==========================================================================
 AC_MSG_CHECKING(for pedantic) 
 AC_ARG_ENABLE(pedantic,   [  --enable-pedantic       enable pedantic compilation flags (no)])
 if test "z$enable_pedantic" = "zyes" ; then
-    dnl CFLAGS="$CFLAGS -pedantic -Wall -ansi -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls"
     CFLAGS="$CFLAGS -O -pedantic -Wall -ansi -fno-inline -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls"
     AC_MSG_RESULT(yes)
 else
@@ -618,11 +593,10 @@ dnl ==========================================================================
 dnl Final steps: lasso config
 dnl ==========================================================================
 LASSO_CORE_CFLAGS="$LASSO_DEFINES" 
-dnl -I${includedir}
 if test $MINGW -eq 1; then 
-LASSO_CORE_LIBS="-llasso-0"
+  LASSO_CORE_LIBS="-llasso-0"
 else
-LASSO_CORE_LIBS="-llasso "
+  LASSO_CORE_LIBS="-llasso "
 fi
 AC_SUBST(LASSO_CORE_CFLAGS)
 AC_SUBST(LASSO_CORE_LIBS)
diff --git a/java/Makefile.am b/java/Makefile.am
index 308b8897..24ebfca4 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -1,7 +1,3 @@
-# Define the java module
-JAVA_MODULE = lasso
-# Define java package name
-JAVA_PACKAGE = com.entrouvert.lasso
 # Define java Package directory, the tailing '/' is mandatory.
 JAVA_PATH = com/entrouvert/lasso/
 JDK_INCLUDES = @JDK_INCLUDE@
@@ -13,24 +9,23 @@ javasharedir = $(prefix)/share/java
 # Shared library.
 javalib_LTLIBRARIES = libjlasso.la
 
-libjlasso_la_SOURCES =	$(JAVA_MODULE)_wrap.c
-
-libjlasso_la_CFLAGS =	$(JDK_INCLUDES) \
-			$(LASSO_CFLAGS) \
-			-I$(top_srcdir)
-
+libjlasso_la_SOURCES =	lasso_wrap.c
+libjlasso_la_CFLAGS = $(JDK_INCLUDES) $(LASSO_CFLAGS) -I$(top_srcdir)
 libjlasso_la_LIBADD =	$(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
-
 libjlasso_la_LDFLAGS =	-no-undefined -avoid-version -module
 
-# Java package
 javashare_DATA = lasso.jar
-JAVA_JAR = lasso.jar
 
-SWIG_OUTPUTS = $(JAVA_PATH)$(JAVA_MODULE).java $(JAVA_MODULE)_wrap.c $(JAVA_MODULE)JNI.java
-JAVA_CRUFT = $(JAVA_PATH)$(JAVA_MODULE).class $(JAVA_MODULE)_wrap.o \
-	$(JAVA_JAR) \
-	$(JAVA_PATH)$(JAVA_MODULE).java
+SWIG_OUTPUTS = lasso_wrap.c \
+	AuthnRequest.java   AuthnResponse.java   Request.java  \
+	Response.java       Server.java          Identity.java \
+	Session.java        Defederation.java    Login.java    \
+	Logout.java         Lecp.java            lassoJNI.java \
+	lasso.java          lassoConstants.java  LogoutRequest.java \
+	FederationTerminationNotification.java   LogoutResponse.java
+
+
+JAVA_CRUFT = $(JAVA_PATH)lasso.class lasso_wrap.o lasso.jar $(JAVA_PATH)lasso.java
 
 # The SWIG outputs are included in the distribution so SWIG is not
 # required to use the Java interface
@@ -40,32 +35,24 @@ CLEANFILES = $(JAVA_CRUFT)
 MAINTAINERCLEANFILES = $(SWIG_OUTPUTS)
 
 
-$(JAVA_MODULE)_wrap.c $(JAVA_MODULE).java: $(top_srcdir)/swig/Lasso.i
-	here=`pwd`; \
-	$(SWIG) -v -java -module $(JAVA_MODULE) -package $(JAVA_PACKAGE) -o $(JAVA_MODULE)_wrap.c $$here/$<
+lasso_wrap.c lasso.java: $(top_srcdir)/swig/Lasso.i
+	$(SWIG) -v -java -module lasso -package com.entrouvert.lasso -o lasso_wrap.c $<
 
 # FIXME There must be a better way to do this with SWIG
-$(JAVA_PATH)$(JAVA_MODULE).java: $(JAVA_MODULE).java
+$(JAVA_PATH)lasso.java: lasso.java
 	mkdir -p $(JAVA_PATH)
-	test -f $(JAVA_PATH)$(JAVA_MODULE).java || cp *.java $(JAVA_PATH)
+	test -f $(JAVA_PATH)lasso.java || cp $(srcdir)/*.java $(JAVA_PATH)
 
 clean-local:
 	rm -f *.class
 	rm -rf com
 
-all-local: $(JAVA_JAR)
+all-local: lasso.jar
 
-$(JAVA_PATH)$(JAVA_MODULE).class: $(JAVA_PATH)$(JAVA_MODULE).java
+$(JAVA_PATH)lasso.class: $(JAVA_PATH)lasso.java
 	$(JAVAC) $(JAVAC_FLAGS) $(JAVA_PATH)*.java
 
-$(JAVA_JAR): $(JAVA_PATH)$(JAVA_MODULE).class 
+lasso.jar: $(JAVA_PATH)lasso.class 
 	rm -f $@
 	jar cf $@ $(JAVA_PATH)*.class 
 
-$(DEPDIR)/libjlasso_la-lasso_wrap.Plo:
-	mkdir -p $(DEPDIR)
-	echo "#dummy" > $(DEPDIR)/libjlasso_la-lasso_wrap.Plo 
-
-$(DEPDIR)/com/entrouvert/lasso/lasso.Po:
-	mkdir -p $(DEPDIR)/com/entrouvert/lasso 
-	echo "#dummy" > $(DEPDIR)/com/entrouvert/lasso/lasso.Po  
diff --git a/php/Makefile.am b/php/Makefile.am
index 8481a5b3..690bf886 100644
--- a/php/Makefile.am
+++ b/php/Makefile.am
@@ -1,35 +1,18 @@
-PHP_PACKAGE=lasso
-
-SWIG_OUTPUTS=$(PHP_PACKAGE)_wrap.c php_$(PHP_PACKAGE).h $(PHP_PACKAGE).php
+SWIG_OUTPUTS = lasso_wrap.c php_lasso.h lasso.php
 
 php_extension_LTLIBRARIES = lasso.la
-lasso_la_CFLAGS = $(LASSO_CFLAGS) \
-			 -I$(top_srcdir) \
-			 $(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=$(PHP_PACKAGE)_wrap.c
-
-php_extensiondir=${prefix}@PHP_UNPREFIXED_EXTENSION_DIR@
-
-$(PHP_PACKAGE)_wrap.c php_$(PHP_PACKAGE).h $(PHP_PACKAGE).php: $(top_srcdir)/swig/Lasso.i
-	$(SWIG) -v -php4 -noproxy \
-		-module $(PHP_PACKAGE) \
-		-o $(PHP_PACKAGE)_wrap.c \
-		-dlname $(PHP_PACKAGE) \
-		$<
+lasso_la_CFLAGS = $(LASSO_CFLAGS) -I$(top_srcdir) $(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
 
-$(DEPDIR)/lasso_la-$(PHP_PACKAGE)_wrap.Plo:
-	echo "#dummy" > $(DEPDIR)/lasso_la-$(PHP_PACKAGE)_wrap.Plo
+php_extensiondir = ${prefix}@PHP_UNPREFIXED_EXTENSION_DIR@
 
-test-php: lasso.la $(PHP_PACKAGE).php
-	$(PHP) -d extension_dir=.libs $(srcdir)/$(PHP_PACKAGE).php
+lasso_wrap.c php_lasso.h lasso.php: $(top_srcdir)/swig/Lasso.i
+	$(SWIG) -v -php4 -noproxy -module lasso -o lasso_wrap.c -dlname lasso $<
 
+test-php: lasso.la lasso.php
+	$(PHP) -d extension_dir=.libs $(srcdir)/lasso.php
 
 MAINTAINERCLEANFILES=$(SWIG_OUTPUTS)
 EXTRA_DIST=$(SWIG_OUTPUTS)
diff --git a/python/Makefile.am b/python/Makefile.am
index 515d876d..893f623d 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -4,37 +4,18 @@ pythondir= $(PY_SITE_PACKAGES)
 python_DATA = lasso.py
 python_LTLIBRARIES = _lasso.la
 
-PYTHON_PACKAGE=lasso
+_lasso_la_SOURCES = lasso_wrap.c
+_lasso_la_CFLAGS = $(LASSO_CFLAGS) -DSWIG_COBJECT_TYPES $(PY_CFLAGS)
+_lasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
+_lasso_la_LDFLAGS = -no-undefined -module -avoid-version
 
-_lasso_la_SOURCES = $(PYTHON_PACKAGE)_wrap.c
-
-_lasso_la_CFLAGS =	$(LASSO_CFLAGS) \
-			-DSWIG_COBJECT_TYPES \
-			$(PY_CFLAGS)
-
-_lasso_la_LIBADD =	$(top_builddir)/lasso/liblasso.la \
-			$(LASSO_LIBS)
-
-_lasso_la_LDFLAGS =	-no-undefined \
-			-module -avoid-version
-
-$(PYTHON_PACKAGE)_wrap.c $(PYTHON_PACKAGE).py: $(top_srcdir)/swig/Lasso.i
-	$(SWIG) -v -python -module $(PYTHON_PACKAGE) -o $(PYTHON_PACKAGE)_wrap.c $<
-
-# Dirty hack, another better way ?
-$(DEPDIR)/_$(PYTHON_PACKAGE)_la-$(PYTHON_PACKAGE)_wrap.Plo:
-	mkdir -p $(DEPDIR)
-	echo "#dummy" > $(DEPDIR)/_$(PYTHON_PACKAGE)_la-$(PYTHON_PACKAGE)_wrap.Plo
-
-SWIG_OUTPUTS = $(PYTHON_PACKAGE)_wrap.c $(PYTHON_PACKAGE).py
+lasso_wrap.c lasso.py: $(top_srcdir)/swig/Lasso.i
+	$(SWIG) -v -python -module lasso -o lasso_wrap.c $<
 
+SWIG_OUTPUTS = lasso_wrap.c lasso.py
 
 # In distribution, swig generated files are present.
 EXTRA_DIST = $(SWIG_OUTPUTS)
 
-# In case of....
-CLEANFILES = *.pyc
-
 # Maintainer clean the swig generated files, because he/she maintains them.
 MAINTAINERCLEANFILES = $(SWIG_OUTPUTS)
-