projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Move new sensor library code into altoslib
[fw/altos]
/
altosui
/
Makefile.am
diff --git
a/altosui/Makefile.am
b/altosui/Makefile.am
index d494547b383ad9d52881613dd0fb1fd53333d9af..0a6ae59e748423c6c63a30272aca87073299d926 100644
(file)
--- a/
altosui/Makefile.am
+++ b/
altosui/Makefile.am
@@
-45,9
+45,6
@@
altosui_JAVA = \
AltosEepromTeleScience.java \
AltosEepromMega.java \
AltosEepromMegaIterable.java \
AltosEepromTeleScience.java \
AltosEepromMega.java \
AltosEepromMegaIterable.java \
- AltosMs5607.java \
- AltosIMU.java \
- AltosMag.java \
AltosEepromSelect.java \
AltosFlash.java \
AltosFlashUI.java \
AltosEepromSelect.java \
AltosFlash.java \
AltosFlashUI.java \
@@
-259,7
+256,7
@@
altosui-jdb: Makefile
echo 'exec jdb -classpath "classes:libaltos:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" altosui/AltosUI "$$@"' >> $@
chmod +x $@
echo 'exec jdb -classpath "classes:libaltos:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" altosui/AltosUI "$$@"' >> $@
chmod +x $@
-libaltos.so:
+libaltos.so:
build-libaltos
-rm -f "$@"
$(LN_S) libaltos/.libs/"$@" .
-rm -f "$@"
$(LN_S) libaltos/.libs/"$@" .
@@
-275,10
+272,14
@@
altos64.dll: libaltos/altos64.dll
-rm -f "$@"
$(LN_S) libaltos/"$@" .
-rm -f "$@"
$(LN_S) libaltos/"$@" .
+libaltos/.libs/libaltos.so: build-libaltos
+
libaltos/altos.dll: build-altos-dll
libaltos/altos64.dll: build-altos64-dll
libaltos/altos.dll: build-altos-dll
libaltos/altos64.dll: build-altos64-dll
+build-libaltos:
+ +cd libaltos && make libaltos.la
build-altos-dll:
+cd libaltos && make altos.dll
build-altos-dll:
+cd libaltos && make altos.dll
@@
-289,7
+290,7
@@
$(ALTOSLIB_CLASS):
-rm -f "$@"
$(LN_S) ../altoslib/"$@" .
-rm -f "$@"
$(LN_S) ../altoslib/"$@" .
-$(FREETTS_CLASS):
../altoslib/"$@"
+$(FREETTS_CLASS):
-rm -f "$@"
$(LN_S) "$(FREETTS)"/"$@" .
-rm -f "$@"
$(LN_S) "$(FREETTS)"/"$@" .