X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMakefile.am;h=4a7aaaa1de0d85ab13d98a4056aebc8d8b6d00c8;hp=b80cabf2d6c4de3bd42964c6af57c78c6ea1f97b;hb=962e3bd0461f187cd599ba54e7129c84f97d4c4d;hpb=2582e9b45bb81ff70fbd5c8581370c8c1b5bd5e5 diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am index b80cabf2..4a7aaaa1 100644 --- a/micropeak/Makefile.am +++ b/micropeak/Makefile.am @@ -1,6 +1,8 @@ JAVAROOT=classes AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation +altoslibdir=$(libdir)/altos + CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:../altosuilib/*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" bin_SCRIPTS=micropeak @@ -122,7 +124,7 @@ endif micropeak: Makefile echo "#!/bin/sh" > $@ - echo 'exec java -cp "$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="$(altoslibdir)" -jar "$(micropeakdir)/micropeak.jar" "$$@"' >> $@ + echo 'exec java -Djava.library.path="$(altoslibdir)" -jar "$(micropeakdir)/micropeak.jar" "$$@"' >> $@ chmod +x $@ micropeak-jdb: Makefile @@ -153,6 +155,8 @@ $(FATJAR): classmicropeak.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(ALTOSUILIB_ -C classes org \ -C ../libaltos libaltosJNI +classaltosui.stamp: $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) + libaltos.so: build-libaltos -rm -f "$@" $(LN_S) ../libaltos/.libs/"$@" .