diff options
| author | Keith Packard <keithp@keithp.com> | 2014-01-01 22:08:13 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-01 22:08:13 -0800 |
| commit | 06ffd8022ff5ac74274c9839d42c0c47274cb8b9 (patch) | |
| tree | ef0367cdfa41e82d7393b7d246f81712f0cac2a0 | |
| parent | 8bff2822c242d2878b408b9c0d8a7647108ea4b1 (diff) | |
altosui: Require both libaltos32 and libaltos64 for fat Linux tarball
No sense shipping a broken tarball ever
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altosui/Makefile.am | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/altosui/Makefile.am b/altosui/Makefile.am index dc34c444..9bc10740 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -98,7 +98,8 @@ ALTOSUILIB_CLASS=\ altosuilib_$(ALTOSUILIB_VERSION).jar LIBALTOS= \ - libaltos.so \ + libaltos32.so \ + libaltos64.so \ libaltos.dylib \ altos.dll @@ -175,11 +176,7 @@ WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) -if MULTI_ARCH LINUX_LIBS=libaltos32.so libaltos64.so -else -LINUX_LIBS=libaltos.so -endif LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC) LINUX_EXTRA=altosui-fat @@ -271,10 +268,6 @@ altosui-jdb: Makefile echo 'exec jdb -classpath "classes:./*:../libaltos:$(FREETTS)/freetts.jar:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="../libaltos/.libs" altosui/AltosUI "$$@"' >> $@ chmod +x $@ -libaltos.so: build-libaltos - -rm -f "$@" - $(LN_S) ../libaltos/.libs/"$@" . - libaltos32.so: build-libaltos -rm -f "$@" $(LN_S) ../libaltos/.libs/"$@" . @@ -295,7 +288,9 @@ altos64.dll: ../libaltos/altos64.dll -rm -f "$@" $(LN_S) ../libaltos/"$@" . -../libaltos/.libs/libaltos.so: build-libaltos +../libaltos/.libs/libaltos64.so: ../libaltos/.libs/libaltos32.so + +../libaltos/.libs/libaltos32.so: build-libaltos ../libaltos/altos.dll: build-altos-dll |