From 0b33fe9a2d29b88520f476198875f41a461a5a72 Mon Sep 17 00:00:00 2001
From: Romain Chantereay <rchantereau@entrouvert.com>
Date: Mon, 23 Aug 2004 17:16:17 +0000
Subject: Cleaned a little the automake files.

Proper use of $(top_srcdir).

Proper use of $DEPDIR.

Added $(top_srcdir)/swig/Lasso.c to java shared object compilation.
---
 java/Makefile.am | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'java')

diff --git a/java/Makefile.am b/java/Makefile.am
index dfef1497..d91df56f 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -13,7 +13,8 @@ javasharedir = $(prefix)/share/java
 # Shared library.
 javalib_LTLIBRARIES = libjlasso.la
 
-libjlasso_la_SOURCES =	$(JAVA_MODULE)_wrap.c
+libjlasso_la_SOURCES =	$(JAVA_MODULE)_wrap.c \
+			$(top_srcdir)/swig/Lasso.c
 libjlasso_la_CFLAGS =	$(JDK_INCLUDES) \
 			$(LASSO_CFLAGS) \
 			-I$(top_srcdir)
@@ -39,7 +40,7 @@ CLEANFILES = $(JAVA_CRUFT)
 MAINTAINERCLEANFILES = $(SWIG_OUTPUTS)
 
 
-$(JAVA_MODULE)_wrap.c $(JAVA_MODULE).java.in: $(srcdir)/../swig/Lasso.i
+$(JAVA_MODULE)_wrap.c $(JAVA_MODULE).java.in: $(top_srcdir)/swig/Lasso.i
 	here=`pwd`; \
 	$(SWIG) -v -java -noproxy -module $(JAVA_MODULE) -package $(JAVA_PACKAGE) -o $(JAVA_MODULE)_wrap.c $$here/$<; \
 	if test -r $(JAVA_MODULE)JNI.java; then \
@@ -77,9 +78,10 @@ $(JAVA_JAR): $(JAVA_PATH)$(JAVA_MODULE).class
 	rm -f $@
 	jar cf $@ $(JAVA_PATH)$(JAVA_MODULE).class 
 
-.deps/libjlasso_la-lasso_wrap.Plo:
-	echo "#dummy" > .deps/libjlasso_la-lasso_wrap.Plo 
+$(DEPDIR)/libjlasso_la-lasso_wrap.Plo:
+	mkdir -p $(DEPDIR)
+	echo "#dummy" > $(DEPDIR)/libjlasso_la-lasso_wrap.Plo 
 
-.deps/com/entrouvert/lasso/lasso.Po:
-	mkdir -p .deps/com/entrouvert/lasso 
-	echo "#dummy" > .deps/com/entrouvert/lasso/lasso.Po  
+$(DEPDIR)/com/entrouvert/lasso/lasso.Po:
+	mkdir -p $(DEPDIR)/com/entrouvert/lasso 
+	echo "#dummy" > $(DEPDIR)/com/entrouvert/lasso/lasso.Po  
-- 
cgit