New Autotools infrastructure.

Don't hesitate to report bug (if any).

Main changes:

- No more, or so few AM_CONDITIONAL.

- Binding compilation use AC_SUBST top level Makefile SUBDIRS.

- Change order of AM Macro.

- Added Macro.

- Fix Windows Compilation.

- New way to handle version number.

- Use of lasso_config.h

- more ? I do not remember.

6 files changed, 605 insertions, 92 deletions

diff --git a/java/Makefile b/java/Makefile
deleted file mode 100644
index 0c727dd7..00000000
--- a/java/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-TARGET=target
-
-#JAVAC=/usr/bin/javac
-#JAVAH=/usr/bin/javah
-#JAVAH_CLASSPATH_PREFIX=
-#JAR=/usr/bin/jar
-
-#JAVAC=/opt/jdk/bin/javac
-#JAVAH=/opt/jdk/bin/javah
-#JAVAH_CLASSPATH_PREFIX=
-#JAR=/opt/jdk/bin/jar
-
-JAVAC=/usr/lib/kaffe/bin/javac
-JAVAH=/usr/lib/kaffe/bin/javah
-JAVAH_CLASSPATH_PREFIX=/usr/share/kaffe/Klasses.jar:
-JAR=/usr/lib/kaffe/bin/jar
-
-#JAVAC=/usr/bin/gcj -C
-#JAVAH=/usr/bin/gcjh -jni
-#JAVAH_CLASSPATH_PREFIX=
-#JAR=/usr/bin/fastjar
-
-JAVA_BUILD_DIR=${TARGET}/classes
-JAVA_SOURCE_DIR=src/java
-JAVA_PACKAGE=com.entrouvert.lasso
-JAVA_SOURCE=${wildcard ${JAVA_SOURCE_DIR}/${subst .,/,${JAVA_PACKAGE}}/*.java}
-JAVA_CLASSES=${addprefix ${JAVA_PACKAGE}., ${filter-out LassoTest, ${basename ${notdir ${JAVA_SOURCE}}}}}
-LASSO.JAR=${TARGET}/lasso.jar
-
-C_SOURCE_DIR=src/c
-C_BUILD_DIR=${C_SOURCE_DIR}
-C_SOURCE=${wildcard ${C_SOURCE_DIR}/*.c}
-C_OBJECT=${C_SOURCE:.c=.o}
-LASSO.SO=${TARGET}/libjlasso.so
-
-.PHONY: clean all binary-java binary-c generate-header
-
-all: binary-java binary-c
-
-binary-java:
-	mkdir -p ${JAVA_BUILD_DIR}
-	${JAVAC} -d ${JAVA_BUILD_DIR} ${JAVA_SOURCE}
-	${JAR} cf ${LASSO.JAR} -C ${JAVA_BUILD_DIR} com
-
-generate-header: binary-java
-	${JAVAH} -d ${C_SOURCE_DIR} -classpath ${JAVAH_CLASSPATH_PREFIX}${JAVA_BUILD_DIR} ${JAVA_CLASSES}
-
-binary-c: ${LASSO.SO}
-
-${C_OBJECT}: ${C_SOURCE}
-	${MAKE} -C ${C_SOURCE_DIR}
-
-mylibs = ../lasso/.libs/liblasso.so
-
-${LASSO.SO}: generate-header ${C_OBJECT}
-	$(CC) -shared -lgobject-2.0 -lglib-2.0 $(mylibs) ${C_OBJECT} -o $@
-
-clean:
-	${MAKE} -C ${C_SOURCE_DIR} clean
-	rm -fr ${TARGET} *~ *.log
diff --git a/java/Makefile.am b/java/Makefile.am
new file mode 100644
index 00000000..815f3b66
--- /dev/null
+++ b/java/Makefile.am
@@ -0,0 +1,79 @@
+NULL = 
+
+TARGET=target
+#JAVAC=/usr/lib/kaffe/bin/javac
+#JAVAH=/usr/lib/kaffe/bin/javah
+#JAVAH_CLASSPATH_PREFIX=/usr/share/kaffe/Klasses.jar:
+#JAR=/usr/lib/kaffe/bin/jar
+
+
+JAVA_BUILD_DIR=${TARGET}/classes
+JAVA_SOURCE_DIR=src/java
+JAVA_PACKAGE=com.entrouvert.lasso
+JAVA_SOURCE=${wildcard ${JAVA_SOURCE_DIR}/${subst .,/,${JAVA_PACKAGE}}/*.java}
+JAVA_CLASSES=${addprefix ${JAVA_PACKAGE}., ${filter-out LassoTest, ${basename ${notdir ${JAVA_SOURCE}}}}}
+LASSO_JAR=${TARGET}/lasso.jar
+
+C_SOURCE_DIR=src/c
+C_BUILD_DIR=${C_SOURCE_DIR}
+C_SOURCE=${wildcard ${C_SOURCE_DIR}/*.c}
+C_OBJECT=${C_SOURCE:.c=.o}
+if MINGW
+    LDFLAGS=-L/usr/local/lib -lgobject-2.0-0 -lglib-2.0-0 -llasso 
+    LASSO_DLL=${TARGET}/jlasso.dll
+else
+    LDFLAGS=-lgobject-2.0 -lglib-2.0 -llasso 
+    LASSO_SO=${TARGET}/libjlasso.so
+endif
+
+binary-java:
+	mkdir -p ${JAVA_BUILD_DIR}
+	${JAVAC} ${JAVAC_FLAGS} -d ${JAVA_BUILD_DIR} ${JAVA_SOURCE}
+	${JAR} cf ${LASSO_JAR} -C ${JAVA_BUILD_DIR} com
+
+generate-header: binary-java
+	${JAVAH} ${JAVAH_FLAGS} -d ${C_SOURCE_DIR} -classpath ${JAVAH_CLASSPATH_PREFIX}${JAVA_BUILD_DIR} ${JAVA_CLASSES}
+
+if MINGW
+binary-c: ${LASSO_DLL}
+else
+binary-c: ${LASSO_SO}
+endif
+
+if MINGW
+mylibs = -L../win32/.libs -llasso -L/usr/local/lib
+${LASSO_DLL}: generate-header
+	gcc -mno-cygwin -shared -o ${TARGET}/jlasso.dll \
+            -Wl,--out-implib=${TARGET}/jlasso.a \
+            -Wl,--add-stdcall-alias \
+            -Wl,--export-all-symbols \
+            -Wl,--enable-auto-import \
+            -Wl,--whole-archive ${C_OBJECT} \
+            -Wl,--no-whole-archive -lgobject-2.0-0 -lglib-2.0-0 ${mylibs}
+else
+mylibs = ../lasso/.libs/liblasso.so
+${LASSO_SO}: generate-header
+	$(CC) -shared -lgobject-2.0 -lglib-2.0 $(mylibs) ${C_OBJECT} -o $@
+endif
+
+lib_LTLIBRARIES = \
+                libjlasso.la \
+                $(NULL)
+
+libjlassoinclude_HEADERS = $(NULL)
+
+libjlasso_la_SOURCES = $(NULL)
+
+libjlasso_la_LIBADD = \
+        binary-c \
+        $(NULL)
+
+all-redirect: binary-c 
+
+clean:
+	rm -fr ${TARGET} *~ *.log
+
+
+EXTRA_DIST = $(NULL)
+SUBDIRS = src $(NULL)
+
diff --git a/java/coldfusion/Makefile b/java/coldfusion/Makefile
index 0af02232..2ee70e95 100644
--- a/java/coldfusion/Makefile
+++ b/java/coldfusion/Makefile
@@ -1,30 +1,506 @@
-TARGET=target
-
-#JAVAC=/usr/bin/javac
-#JAVAH=/usr/bin/javah
-#JAVAH_CLASSPATH_PREFIX=
-#JAR=/usr/bin/jar
-
-#JAVAC=/opt/jdk/bin/javac
-#JAVAH=/opt/jdk/bin/javah
-#JAVAH_CLASSPATH_PREFIX=
-#JAR=/opt/jdk/bin/jar
-
-JAVAC=/usr/lib/kaffe/bin/javac
-JAVAH=/usr/lib/kaffe/bin/javah
-JAVAH_CLASSPATH_PREFIX=/usr/share/kaffe/Klasses.jar:
-JAR=/usr/lib/kaffe/bin/jar
-
-#JAVAC=/usr/bin/gcj -C
-#JAVAH=/usr/bin/gcjh -jni
-#JAVAH_CLASSPATH_PREFIX=
-#JAR=/usr/bin/fastjar
-
-JAVA_BUILD_DIR=${TARGET}/classes
-JAVA_SOURCE_DIR=src
-JAVA_SOURCE=${wildcard ${JAVA_SOURCE_DIR}/*.java}
-JAVA_CLASSES=${basename ${notdir ${JAVA_SOURCE}}}
-LASSO.JAR=${TARGET}/CFLasso.jar
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# java/coldfusion/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+srcdir = .
+top_srcdir = ../..
+
+pkgdatadir = $(datadir)/lasso
+pkglibdir = $(libdir)/lasso
+pkgincludedir = $(includedir)/lasso
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = i686-pc-mingw32
+subdir = java/coldfusion
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/lasso/lasso_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = aclocal
+AMDEP_FALSE = #
+AMDEP_TRUE = 
+AMTAR = ${SHELL} /home/eo/lasso/missing --run tar
+AR = ar
+AS = as
+AUTOCONF = autoconf
+AUTOHEADER = ${SHELL} /home/eo/lasso/missing --run autoheader
+AUTOMAKE = automake
+AWK = gawk
+CC = gcc -mno-cygwin
+CCDEPMODE = depmode=gcc3
+CFLAGS =  -D_MSC_VER -DIN_LASSO -DMINGW -DWIN32 -D_WIN32 -I/usr/local/include
+CHECK_CFLAGS = 
+CHECK_LIBS = 
+CPP = gcc -mno-cygwin -E
+CPPFLAGS = 
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = cygpath -w
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DLLTOOL = dlltool
+ECHO = echo
+ECHO_C = 
+ECHO_N = -n
+ECHO_T = 
+EGREP = grep -E
+EXEEXT = .exe
+F77 = g77
+FFLAGS = -g -O2
+GTK_DOC_CFLAGS =  
+GTK_DOC_LIBS =  
+HTML_DIR = ${datadir}/gtk-doc/html
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+JAR = jar
+JAVA = gij
+JAVAC = gcj
+JAVAC_FLAGS = -C
+JAVAH = gcjh
+JAVAH_FLAGS = -jni
+JAVA_VERSION = 3.3.1
+LASSO_APP_DEFINES = 
+LASSO_CFLAGS =  -I${prefix}/include/lasso -DXMLSEC_CRYPTO=\"openssl\" -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1 -DXMLSEC_LIBXML_260=1 -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_XKMS=1 -DXMLSEC_CRYPTO_OPENSSL=1 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/libxml2 -I/usr/local/include -I/usr/local/include/xmlsec  
+LASSO_CORE_CFLAGS =  -I${prefix}/include/lasso
+LASSO_CORE_LIBS = -llasso-0
+LASSO_DEFINES = 
+LASSO_DOCDIR = $(datadir)/doc/lasso
+LASSO_LIBS = -L${exec_prefix}/lib -L/usr/local/lib -lgobject-2.0-0 -lglib-2.0-0 -lintl -lxmlsec-openssl -lxmlsec -lxslt -lxml2 -lz -liconv  
+LASSO_STATIC_BINARIES = 
+LASSO_VERSION_INFO = 0:0:0
+LDFLAGS =  -L/usr/local/lib
+LIBOBJS = 
+LIBS = 
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LIBTOOL_DEPS = ./ltmain.sh
+LN_S = ln -s
+LTLIBOBJS = 
+MAINT = #
+MAINTAINER_MODE_FALSE = 
+MAINTAINER_MODE_TRUE = #
+MAKEINFO = ${SHELL} /home/eo/lasso/missing --run makeinfo
+MINGW_FALSE = #
+MINGW_TRUE = 
+OBJDUMP = objdump
+OBJEXT = o
+PACKAGE = lasso
+PACKAGE_BUGREPORT = lasso-devel@lists.labs.libre-entreprise.org
+PACKAGE_NAME = Liberty Alliance Single Sign On
+PACKAGE_STRING = Liberty Alliance Single Sign On 0.3.0
+PACKAGE_TARNAME = liberty-alliance-single-sign-on
+PACKAGE_VERSION = 0.3.0
+PATH_SEPARATOR = :
+PKG_CONFIG = pkg-config
+PYTHON = python
+PYTHON_VERSION = 2.3
+RANLIB = ranlib
+RC = windres
+SD_LANG =  java
+SET_MAKE = 
+SHELL = /bin/bash
+STRIP = strip
+SWIG = swig
+SWIG_PYTHON_ARGS = -noproxy
+TAR = tar
+U = 
+VERSION = 0.3.0
+WITH_PYTHON_FALSE = 
+WITH_PYTHON_TRUE = #
+WITH_TESTS_FALSE = 
+WITH_TESTS_TRUE = #
+ac_ct_AR = ar
+ac_ct_AS = as
+ac_ct_CC = 
+ac_ct_CXX = g++
+ac_ct_DLLTOOL = dlltool
+ac_ct_F77 = g77
+ac_ct_OBJDUMP = objdump
+ac_ct_RANLIB = ranlib
+ac_ct_RC = windres
+ac_ct_STRIP = strip
+am__fastdepCC_FALSE = #
+am__fastdepCC_TRUE = 
+am__fastdepCXX_FALSE = #
+am__fastdepCXX_TRUE = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+bindir = ${exec_prefix}/bin
+build = i686-pc-cygwin
+build_alias = 
+build_cpu = i686
+build_os = cygwin
+build_vendor = pc
+datadir = ${prefix}/share
+exec_prefix = ${prefix}
+host = i686-pc-mingw32
+host_alias = i686-pc-mingw32
+host_cpu = i686
+host_os = mingw32
+host_vendor = pc
+includedir = ${prefix}/include
+infodir = ${prefix}/info
+install_sh = /home/eo/lasso/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localstatedir = ${prefix}/var
+mandir = ${prefix}/man
+mkdir_p = mkdir -p -- .
+oldincludedir = /usr/include
+prefix = /usr/local
+program_transform_name = s,x,x,
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+sysconfdir = ${prefix}/etc
+target_alias = 
+NULL = 
+SUBDIRS = 
+TARGET = target
+
+#JAVAC=/usr/lib/kaffe/bin/javac
+#JAVAH=/usr/lib/kaffe/bin/javah
+#JAVAH_CLASSPATH_PREFIX=/usr/share/kaffe/Klasses.jar:
+#JAR=/usr/lib/kaffe/bin/jar
+JAVA_BUILD_DIR = ${TARGET}/classes
+JAVA_SOURCE_DIR = src
+JAVA_SOURCE = ${wildcard ${JAVA_SOURCE_DIR}/*.java}
+JAVA_CLASSES = ${basename ${notdir ${JAVA_SOURCE}}}
+LASSO_JAR = ${TARGET}/CFLasso.jar
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  java/coldfusion/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  java/coldfusion/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: # $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || mkdir "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="../$(top_distdir)" \
+	        distdir="../$(distdir)/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-libtool clean-recursive ctags \
+	ctags-recursive distclean distclean-generic distclean-libtool \
+	distclean-recursive distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive \
+	mostlyclean mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-info-am
+
 
 .PHONY: clean all binary-java
 
@@ -33,7 +509,10 @@ all: binary-java
 binary-java:
 	mkdir -p ${JAVA_BUILD_DIR}
 	${JAVAC} -classpath ../target/lasso.jar -d ${JAVA_BUILD_DIR} ${JAVA_SOURCE}
-	${JAR} cf ${LASSO.JAR} -C ${JAVA_BUILD_DIR} CFLasso.class
+	${JAR} cf ${LASSO_JAR} -C ${JAVA_BUILD_DIR} CFLasso.class
 
 clean:
 	rm -rf ${TARGET} *~ *.log
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/java/src/Makefile.am b/java/src/Makefile.am
new file mode 100644
index 00000000..670b4f1a
--- /dev/null
+++ b/java/src/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS=c
diff --git a/java/src/c/Makefile b/java/src/c/Makefile.am
index 55e6bd03..eec8fca9 100644
--- a/java/src/c/Makefile
+++ b/java/src/c/Makefile.am
@@ -1,4 +1,17 @@
-CFLAGS = \
+if MINGW
+JAVA_CFLAGS = -mno-cygwin -mwindows -D_MSC_VER=1 \
+    -D_WIN32 -DWIN32 -DLASSO_DEBUG \
+    -I../../.. \
+    -I../../win32 \
+    -I. -g \
+    -I/usr/local/include \
+    -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include \
+    -I/usr/local/include/libxml2 \
+    -DXMLSEC_CRYPTO="openssl" -DXMLSEC_LIBXML_260=1 \
+    -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_XKMS=1 \
+    -DXMLSEC_NO_CRYPTO_DYNAMIC_LOADING=1 -DXMLSEC_CRYPTO_OPENSSL=1 
+else
+JAVA_CFLAGS = \
     -g \
     -I. -I/opt/jdk/include -I/opt/jdk/include/linux \
     -I../../.. \
@@ -6,7 +19,7 @@ CFLAGS = \
     -I/usr/include/glib-2.0 \
     -I/usr/lib/glib-2.0/include \
     -DXMLSEC_LIBXML_260=1 -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_XKMS=1 -DXMLSEC_NO_CRYPTO_DYNAMIC_LOADING=1 -I/usr/include/xmlsec1 -I/usr/include/libxml2 -DXMLSEC_CRYPTO_OPENSSL=1 -DXMLSEC_CRYPTO=\"openssl\"
-
+endif
 C_SOURCE = ${wildcard *.c}
 C_OBJECT = ${C_SOURCE:.c=.o}
 
@@ -15,7 +28,7 @@ C_OBJECT = ${C_SOURCE:.c=.o}
 all: ${C_OBJECT}
 
 %.o: %.c %.h
-	${CC} $(CFLAGS) -c $<
+	${CC} $(JAVA_CFLAGS) -c $<
 
 clean:
 	rm -f ${C_OBJECT} *~
diff --git a/java/tests/LoginTest.java b/java/tests/LoginTest.java
index 8e14bb11..9130dc81 100644
--- a/java/tests/LoginTest.java
+++ b/java/tests/LoginTest.java
@@ -215,7 +215,8 @@ public class LoginTest extends TestCase {
     }
 
     public static void main(String args[]) { 
-	Lasso.init();
+        System.out.println(System.mapLibraryName("jlasso"));
+        Lasso.init();
 	junit.textui.TestRunner.run(suite());
 	Lasso.shutdown();
     }