diff options
| author | Romain Chantereay <rchantereau@entrouvert.com> | 2004-08-20 11:51:34 +0000 |
|---|---|---|
| committer | Romain Chantereay <rchantereau@entrouvert.com> | 2004-08-20 11:51:34 +0000 |
| commit | d6122574a1d5a661a091e4cd97af68d4a540b4db (patch) | |
| tree | d35e25f1997fa7164d699f19e4dfddd0146f097b /java | |
| parent | f333b5dabf765901b063c2670842a18a9596cf5a (diff) | |
| download | lasso-d6122574a1d5a661a091e4cd97af68d4a540b4db.tar.gz lasso-d6122574a1d5a661a091e4cd97af68d4a540b4db.tar.xz lasso-d6122574a1d5a661a091e4cd97af68d4a540b4db.zip | |
Removed an useless inclusion directory.
Coded mechanisms in order to permit distcheck to work cleanly.
It is a little dirty, but... Perphas using libtool facilities.
Diffstat (limited to 'java')
| -rw-r--r-- | java/Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/Makefile.am b/java/Makefile.am index 59534ef3..89a81062 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -16,7 +16,7 @@ javalib_LTLIBRARIES = libjlasso.la libjlasso_la_SOURCES = $(JAVA_MODULE)_wrap.c libjlasso_la_CFLAGS = $(JDK_INCLUDES) \ $(LASSO_CFLAGS) \ - -I$(top_srcdir) -I$(top_srcdir)/lasso + -I$(top_srcdir) libjlasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) @@ -41,8 +41,6 @@ MAINTAINERCLEANFILES = $(SWIG_OUTPUTS) $(JAVA_MODULE)_wrap.c $(JAVA_MODULE).java.in: $(srcdir)/../swig/Lasso.i here=`pwd`; \ - mkdir -p $(JAVA_PATH) \ - cd $(JAVA_PATH); \ $(SWIG) -v -java -noproxy -module $(JAVA_MODULE) -package $(JAVA_PACKAGE) -o $(JAVA_MODULE)_wrap.c $$here/$<; \ if test -r $(JAVA_MODULE)JNI.java; then \ echo "Fixing SWIG 1.3.15+ broken Java API"; \ @@ -56,6 +54,8 @@ $(JAVA_MODULE)_wrap.c $(JAVA_MODULE).java.in: $(srcdir)/../swig/Lasso.i # FIXME There must be a better way to do this with SWIG $(JAVA_PATH)$(JAVA_MODULE).java: $(JAVA_MODULE).java.in lasso-fragment.java + mkdir -p $(JAVA_PATH) + cd $(JAVA_PATH) sed -e 's/^}//' $(JAVA_MODULE).java.in > $(JAVA_PATH)$(JAVA_MODULE).java.tmp cat $(JAVA_PATH)$(JAVA_MODULE).java.tmp lasso-fragment.java > $@ echo "}" >> $@ @@ -68,6 +68,8 @@ clean-local: all-local: $(JAVA_JAR) $(JAVA_PATH)$(JAVA_MODULE).class: $(JAVA_PATH)$(JAVA_MODULE).java + mkdir -p $(JAVA_PATH) + cp $(srcdir)/$(JAVA_PATH)$(JAVA_MODULE).java $(JAVA_PATH) $(JAVAC) $(JAVAC_FLAGS) $(JAVA_PATH)$(JAVA_MODULE).java $(JAVA_JAR): $(JAVA_PATH)$(JAVA_MODULE).class |