altosui: Move java altoslib to top level

[fw/altos] / altosui / Makefile.am

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 7a3c53e723cccdcf6abb7e0305372712cf8a4fac..d494547b383ad9d52881613dd0fb1fd53333d9af 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=libaltos altoslib
+SUBDIRS=libaltos
 JAVAROOT=classes
 AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
 
@@ -6,7 +6,7 @@ man_MANS=altosui.1
 
 altoslibdir=$(libdir)/altos
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:altoslib/bin:libaltos:$(FREETTS)/*:/usr/share/java/*"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos:$(FREETTS)/*:/usr/share/java/*"
 
 bin_SCRIPTS=altosui
 
@@ -287,9 +287,9 @@ build-altos64-dll:
 
 $(ALTOSLIB_CLASS):
        -rm -f "$@"
-       $(LN_S) altoslib/"$@" .
+       $(LN_S) ../altoslib/"$@" .
 
-$(FREETTS_CLASS):
+$(FREETTS_CLASS): ../altoslib/"$@"
        -rm -f "$@"
        $(LN_S) "$(FREETTS)"/"$@" .