altosui: Store libaltos.so in $(libdir)/altos

It's not a public library, so hide it away in a subdirectory.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index 760e662de26c996cb576c8c7ee16d3fd8744e3eb..804e0c740cf4b6d909cfd118e3cb0f99fad4f10d 100644 (file)
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -1,6 +1,8 @@
 JAVAROOT=classes
 AM_JAVACFLAGS=-encoding UTF-8
 
+altoslibdir=$(libdir)/altos
+
 CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*"
 
 bin_SCRIPTS=altosui
@@ -131,12 +133,12 @@ Manifest-fat.txt:
 
 altosui: Makefile
        echo "#!/bin/sh" > $@
-       echo 'exec java  -cp "$(FREETTS)/*" -Djava.library.path="$(libdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
+       echo 'exec java  -cp "$(FREETTS)/*" -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
        chmod +x $@
 
 altosui-test: Makefile
        echo "#!/bin/sh" > $@
-       echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="../libaltos" -jar altosui.jar "$$*"' >> $@
+       echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@
        chmod +x $@
 
 $(LIBALTOS):

diff --git a/ao-tools/libaltos/Makefile.am b/ao-tools/libaltos/Makefile.am
index 4d29d80e44bab58355c2af6fcb682e03490ffc0e..388d21046dc1c655fb66d20ebd89789fccb832ed 100644 (file)
--- a/ao-tools/libaltos/Makefile.am
+++ b/ao-tools/libaltos/Makefile.am
@@ -1,11 +1,22 @@
 JAVAC=javac
-AM_CFLAGS="-I$(JVM_INCLUDE)"
+AM_CFLAGS=-DLINUX -DPOSIX_TTY -I$(JVM_INCLUDE)
 AM_JAVACFLAGS=-encoding UTF-8
 
-lib_LTLIBRARIES=libaltos.la
+altoslibdir=$(libdir)/altos
+
+altoslib_LTLIBRARIES=libaltos.la
+
+libaltos_la_LDFLAGS = -version-info 1:0:1
 
 libaltos_la_SOURCES=\
-       libaltos.c
+       libaltos.c \
+       libaltos_wrap.c
+
+noinst_PROGRAMS=cjnitest
+
+cjnitest_LDADD=libaltos.la
+
+LIBS=
 
 HFILES=libaltos.h
 
@@ -18,6 +29,8 @@ $(SWIG_FILE): libaltos.i0 $(HFILES)
 
 all-local: classlibaltos.stamp
 
+libaltos_wrap.c: classlibaltos.stamp
+
 classlibaltos.stamp: $(SWIG_FILE)
        swig -java -package libaltosJNI $(SWIG_FILE)
        mkdir -p libaltosJNI
@@ -25,4 +38,4 @@ classlibaltos.stamp: $(SWIG_FILE)
        touch classlibaltos.stamp
 
 clean-local:
-       -rm -rf libaltosJNI *.class *.java classlibaltos.stamp $(SWIG_FILE)
\ No newline at end of file
+       -rm -rf libaltosJNI *.class *.java classlibaltos.stamp $(SWIG_FILE) libaltos_wrap.c