projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: libaltos.so is built with libtool -- it's in ../libaltos/.libs
[fw/altos]
/
ao-tools
/
altosui
/
Makefile.am
diff --git
a/ao-tools/altosui/Makefile.am
b/ao-tools/altosui/Makefile.am
index 65a3cf9aafe2ca77260e03428e48147027541937..56e6d7ae91ecec62f97bd47a2dc0bc8983c1e1e0 100644
(file)
--- a/
ao-tools/altosui/Makefile.am
+++ b/
ao-tools/altosui/Makefile.am
@@
-1,7
+1,13
@@
JAVAROOT=classes
AM_JAVACFLAGS=-encoding UTF-8
JAVAROOT=classes
AM_JAVACFLAGS=-encoding UTF-8
-CLASSPATH_ENV=CLASSPATH="classes/altosui/*:../libaltos/libaltosJNI/*:$(FREETTS)/*:/usr/share/java/*"
+man_MANS=altosui.1
+
+altoslibdir=$(libdir)/altos
+
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*"
+
+bin_SCRIPTS=altosui
altosui_JAVA = \
AltosChannelMenu.java \
altosui_JAVA = \
AltosChannelMenu.java \
@@
-78,18
+84,19
@@
WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
FAT_FILES=$(FATJAR) $(FREETTS_CLASS)
FAT_FILES=$(FATJAR) $(FREETTS_CLASS)
-LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) altosui-fat
+LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE)
+LINUX_EXTRA=altosui-fat
MACOSX_FILES=$(FAT_FILES) libaltos.dylib
MACOSX_EXTRA=$(FIRMWARE)
WINDOWS_FILES=$(FAT_FILES) altos.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
MACOSX_FILES=$(FAT_FILES) libaltos.dylib
MACOSX_EXTRA=$(FIRMWARE)
WINDOWS_FILES=$(FAT_FILES) altos.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
-all-local: classes/altosui $(JAR)
$(FATJAR)
altosui altosui-test
+all-local: classes/altosui $(JAR) altosui altosui-test
clean-local:
clean-local:
- -rm -rf classes
/altosui
$(JAR) $(FATJAR) \
- $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST) $(FREETTS_CLASS) \
+ -rm -rf classes $(JAR) $(FATJAR) \
+ $(LINUX_DIST) $(MACOSX_DIST)
windows
$(WINDOWS_DIST) $(FREETTS_CLASS) \
$(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
altosui altosui-test macosx linux
$(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
altosui altosui-test macosx linux
@@
-128,15
+135,23
@@
Manifest-fat.txt:
altosui: Makefile
echo "#!/bin/sh" > $@
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" > $@
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 $@
chmod +x $@
-$(LIBALTOS):
+libaltos.so:
+ -rm -f "$@"
+ $(LN_S) ../libaltos/.libs/"$@" .
+
+libaltos.dylib:
+ -rm -f "$@"
+ $(LN_S) ../libaltos/"$@" .
+
+altos.dll:
-rm -f "$@"
$(LN_S) ../libaltos/"$@" .
-rm -f "$@"
$(LN_S) ../libaltos/"$@" .
@@
-144,11
+159,13
@@
$(FREETTS_CLASS):
-rm -f "$@"
$(LN_S) "$(FREETTS)"/"$@" .
-rm -f "$@"
$(LN_S) "$(FREETTS)"/"$@" .
-$(LINUX_DIST): $(LINUX_FILES)
+$(LINUX_DIST): $(LINUX_FILES)
$(LINUX_EXTRA)
-rm -f $@
-rm -rf linux
mkdir -p linux/AltOS
-rm -f $@
-rm -rf linux
mkdir -p linux/AltOS
- cp -a $(LINUX_FILES) linux/AltOS
+ cp -p $(LINUX_FILES) linux/AltOS
+ cp -p altosui-fat linux/AltOS/altosui
+ chmod +x linux/AltOS/altosui
tar cjf $@ -C linux AltOS
$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
tar cjf $@ -C linux AltOS
$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
@@
-164,4
+181,4
@@
$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
$(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
-rm -f $@
$(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
-rm -f $@
- makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
\ No newline at end of file
+ makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi