X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FMakefile.am;h=a42426cdef0a1e3ab1542923a4c2a613f6928be2;hp=de7a86c09536d6fbd0bbe2a0ff18bb3722f62167;hb=868ef0c9c4b208c02a87180b0eede329369bdc77;hpb=8ca58e20208495ce63b8256a8ffa43932867e8d5

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index de7a86c0..a42426cd 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -1,4 +1,4 @@
-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/*:libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar"
 
 bin_SCRIPTS=altosui
 
@@ -24,6 +24,7 @@ altosui_JAVA = \
 	AltosConfig.java \
 	AltosConfigFreqUI.java \
 	AltosConfigUI.java \
+	AltosConfigPyroUI.java \
 	AltosConfigureUI.java \
 	AltosConfigTD.java \
 	AltosConfigTDUI.java \
@@ -232,13 +233,13 @@ $(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICONS) $(ALTOSLIB_CLASS)
 	jar cfm $@ Manifest.txt \
 		$(ICONJAR) \
 		-C classes altosui \
-		-C libaltos libaltosJNI
+		-C ../libaltos libaltosJNI
 
 $(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICONS)
 	jar cfm $@ Manifest-fat.txt \
 		$(ICONJAR) \
 		-C classes altosui \
-		-C libaltos libaltosJNI
+		-C ../libaltos libaltosJNI
 
 Manifest.txt: Makefile
 	echo 'Main-Class: altosui.AltosUI' > $@
@@ -255,43 +256,43 @@ altosui: Makefile
 
 altosui-test: Makefile
 	echo "#!/bin/sh" > $@
-	echo 'exec java -cp "./*:$(FREETTS)/freetts.jar:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+	echo 'exec java -cp "./*:../libaltos:$(FREETTS)/freetts.jar:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@
 	chmod +x $@
 
 altosui-jdb: Makefile
 	echo "#!/bin/sh" > $@
-	echo 'exec jdb -classpath "classes:libaltos:$(FREETTS)/freetts.jar:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="libaltos/.libs" altosui/AltosUI "$$@"' >> $@
+	echo 'exec jdb -classpath "classes:../libaltos:$(FREETTS)/freetts.jar:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="../libaltos/.libs" altosui/AltosUI "$$@"' >> $@
 	chmod +x $@
 
 libaltos.so: build-libaltos
 	-rm -f "$@"
-	$(LN_S) libaltos/.libs/"$@" .
+	$(LN_S) ../libaltos/.libs/"$@" .
 
 libaltos.dylib:
 	-rm -f "$@"
-	$(LN_S) libaltos/"$@" .
+	$(LN_S) ../libaltos/"$@" .
 
-altos.dll: libaltos/altos.dll
+altos.dll: ../libaltos/altos.dll
 	-rm -f "$@"
-	$(LN_S) libaltos/"$@" .
+	$(LN_S) ../libaltos/"$@" .
 
-altos64.dll: libaltos/altos64.dll
+altos64.dll: ../libaltos/altos64.dll
 	-rm -f "$@"
-	$(LN_S) libaltos/"$@" .
+	$(LN_S) ../libaltos/"$@" .
 
-libaltos/.libs/libaltos.so: build-libaltos
+../libaltos/.libs/libaltos.so: build-libaltos
 
-libaltos/altos.dll: build-altos-dll
+../libaltos/altos.dll: build-altos-dll
 
-libaltos/altos64.dll: build-altos64-dll
+../libaltos/altos64.dll: build-altos64-dll
 
 build-libaltos:
-	+cd libaltos && make libaltos.la
+	+cd ../libaltos && make libaltos.la
 build-altos-dll:
-	+cd libaltos && make altos.dll
+	+cd ../libaltos && make altos.dll
 
 build-altos64-dll:
-	+cd libaltos && make altos64.dll
+	+cd ../libaltos && make altos64.dll
 
 $(ALTOSLIB_CLASS):
 	-rm -f "$@"