projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Clean up random rebase failures
[fw/altos]
/
altosui
/
Makefile.am
diff --git
a/altosui/Makefile.am
b/altosui/Makefile.am
index 7a3c53e723cccdcf6abb7e0305372712cf8a4fac..9fc7b5b3aaa0b50dccf5e61890f59cb83aaa14da 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
JAVAROOT=classes
AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
@@
-6,7
+6,7
@@
man_MANS=altosui.1
altoslibdir=$(libdir)/altos
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
bin_SCRIPTS=altosui
@@
-27,8
+27,6
@@
altosui_JAVA = \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
- AltosConvert.java \
- AltosCRCException.java \
AltosCSV.java \
AltosCSVUI.java \
AltosDebug.java \
AltosCSV.java \
AltosCSVUI.java \
AltosDebug.java \
@@
-42,12
+40,8
@@
altosui_JAVA = \
AltosEepromList.java \
AltosEepromManage.java \
AltosEepromMonitor.java \
AltosEepromList.java \
AltosEepromManage.java \
AltosEepromMonitor.java \
- AltosEepromTeleScience.java \
AltosEepromMega.java \
AltosEepromMegaIterable.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
+253,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
+269,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
@@
-287,7
+285,7
@@
build-altos64-dll:
$(ALTOSLIB_CLASS):
-rm -f "$@"
$(ALTOSLIB_CLASS):
-rm -f "$@"
- $(LN_S) altoslib/"$@" .
+ $(LN_S)
../
altoslib/"$@" .
$(FREETTS_CLASS):
-rm -f "$@"
$(FREETTS_CLASS):
-rm -f "$@"