projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: More cleanups for moving files to altoslib
[fw/altos]
/
altosui
/
Makefile.am
diff --git
a/altosui/Makefile.am
b/altosui/Makefile.am
index cfe453022f5082b028497ab2d36e92e0dd62a5a1..feda00c711a95e640297174910aa86a147695784 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
@@
-22,14
+22,11
@@
altosui_JAVA = \
AltosChannelMenu.java \
AltosCompanionInfo.java \
AltosConfig.java \
AltosChannelMenu.java \
AltosCompanionInfo.java \
AltosConfig.java \
- AltosConfigData.java \
AltosConfigFreqUI.java \
AltosConfigUI.java \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
AltosConfigFreqUI.java \
AltosConfigUI.java \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
- AltosConvert.java \
- AltosCRCException.java \
AltosCSV.java \
AltosCSVUI.java \
AltosDebug.java \
AltosCSV.java \
AltosCSVUI.java \
AltosDebug.java \
@@
-38,28
+35,16
@@
altosui_JAVA = \
AltosDevice.java \
AltosUSBDevice.java \
AltosDisplayThread.java \
AltosDevice.java \
AltosUSBDevice.java \
AltosDisplayThread.java \
- AltosEepromChunk.java \
AltosEepromDelete.java \
AltosEepromDownload.java \
AltosEepromList.java \
AltosEepromDelete.java \
AltosEepromDownload.java \
AltosEepromList.java \
- AltosEepromLog.java \
AltosEepromManage.java \
AltosEepromMonitor.java \
AltosEepromManage.java \
AltosEepromMonitor.java \
- AltosEepromIterable.java \
- AltosEepromRecord.java \
- AltosEepromTeleScience.java \
- AltosEepromMega.java \
- AltosEepromMegaIterable.java \
- AltosMs5607.java \
- AltosIMU.java \
- AltosMag.java \
AltosEepromSelect.java \
AltosEepromSelect.java \
- AltosFile.java \
AltosFlash.java \
AltosFlashUI.java \
AltosFlightDisplay.java \
AltosFlightInfoTableModel.java \
AltosFlash.java \
AltosFlashUI.java \
AltosFlightDisplay.java \
AltosFlightInfoTableModel.java \
- AltosFlightReader.java \
AltosFlightStats.java \
AltosFlightStatsTable.java \
AltosFlightStatus.java \
AltosFlightStats.java \
AltosFlightStatsTable.java \
AltosFlightStatus.java \
@@
-67,7
+52,6
@@
altosui_JAVA = \
AltosFlightUI.java \
AltosFontListener.java \
AltosFreqList.java \
AltosFlightUI.java \
AltosFontListener.java \
AltosFreqList.java \
- AltosGreatCircle.java \
AltosHexfile.java \
Altos.java \
AltosIdleMonitorUI.java \
AltosHexfile.java \
Altos.java \
AltosIdleMonitorUI.java \
@@
-80,24
+64,17
@@
altosui_JAVA = \
AltosLanded.java \
AltosLed.java \
AltosLights.java \
AltosLanded.java \
AltosLed.java \
AltosLights.java \
- AltosLog.java \
AltosPad.java \
AltosUIPreferences.java \
AltosPad.java \
AltosUIPreferences.java \
- AltosReader.java \
- AltosTelemetryReader.java \
- AltosReplayReader.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
AltosScanUI.java \
AltosSerial.java \
AltosSerialInUseException.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
AltosScanUI.java \
AltosSerial.java \
AltosSerialInUseException.java \
- AltosSerialMonitor.java \
AltosSiteMap.java \
AltosSiteMapPreload.java \
AltosSiteMapCache.java \
AltosSiteMapTile.java \
AltosSiteMap.java \
AltosSiteMapPreload.java \
AltosSiteMapCache.java \
AltosSiteMapTile.java \
- AltosState.java \
- AltosTelemetryReader.java \
AltosUI.java \
AltosUIListener.java \
AltosFrame.java \
AltosUI.java \
AltosUIListener.java \
AltosFrame.java \
@@
-253,11
+230,11
@@
$(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(FREETTS_CLASS
Manifest.txt: Makefile
echo 'Main-Class: altosui.AltosUI' > $@
Manifest.txt: Makefile
echo 'Main-Class: altosui.AltosUI' > $@
- echo "Class-Path:
altosl
ib.jar $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JCOMMON)/jcommon.jar" >> $@
+ echo "Class-Path:
AltosL
ib.jar $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JCOMMON)/jcommon.jar" >> $@
Manifest-fat.txt:
echo 'Main-Class: altosui.AltosUI' > $@
Manifest-fat.txt:
echo 'Main-Class: altosui.AltosUI' > $@
- echo "Class-Path:
altosl
ib.jar freetts.jar jfreechart.jar jcommon.jar" >> $@
+ echo "Class-Path:
AltosL
ib.jar freetts.jar jfreechart.jar jcommon.jar" >> $@
altosui: Makefile
echo "#!/bin/sh" > $@
altosui: Makefile
echo "#!/bin/sh" > $@
@@
-266,7
+243,7
@@
altosui: Makefile
altosui-test: Makefile
echo "#!/bin/sh" > $@
altosui-test: Makefile
echo "#!/bin/sh" > $@
- echo 'exec java -cp "
:altoslib
/*:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+ echo 'exec java -cp "
.
/*:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" -jar altosui.jar "$$@"' >> $@
chmod +x $@
altosui-jdb: Makefile
chmod +x $@
altosui-jdb: Makefile
@@
-274,7
+251,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/"$@" .
@@
-290,10
+267,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
@@
-302,7
+283,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 "$@"