X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=micropeak%2FMakefile.am;h=09cf9617cf9e07485c4a67c73ed15b363544d615;hb=d225adc3af9e5726d436cbbdbf8dcc5837e50804;hp=23ec077ec4cda796c35f9b4d4970c2ec93621465;hpb=318b81d59e6f34a92a7a78c0896aa331bc14d0a1;p=fw%2Faltos

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 23ec077e..09cf9617 100644
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -37,7 +37,7 @@ JAR=micropeak.jar
 FATJAR=micropeak-fat.jar
 
 if MULTI_ARCH
-LIBALTOS_LINUX=libaltos32.so libaltos64.so
+LIBALTOS_LINUX=libaltos_i686.so libaltos_amd64.so libaltos_aarch64.so libaltos_armel.so libaltos_armhf.so
 else
 LIBALTOS_LINUX=libaltos.so
 endif
@@ -137,7 +137,7 @@ MACOSX_DRIVERS=$(MACOSX_DRIVER_1) $(MACOSX_DRIVER_0)
 
 MACOSX_INFO_PLIST=Info.plist
 MACOSX_README=ReadMe-Mac.rtf
-MACOSX_INSTALL=../altosui/install-macosx
+MACOSX_INSTALL=../altosui/install-macosx ../altosui/ask-pass
 MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVERS) $(MACOSX_README) $(DOC) $(MACOSX_ICONS) $(MACOSX_INSTALL)
 
 $(MACOSX_DRIVER_0):
@@ -241,11 +241,23 @@ libaltos.so: build-libaltos
 	-rm -f "$@"
 	$(LN_S) ../libaltos/.libs/"$@" .
 
-libaltos32.so: build-libaltos
+libaltos_i686.so: build-libaltos
 	-rm -f "$@"
 	$(LN_S) ../libaltos/.libs/"$@" .
 
-libaltos64.so: build-libaltos
+libaltos_amd64.so: build-libaltos
+	-rm -f "$@"
+	$(LN_S) ../libaltos/.libs/"$@" .
+
+libaltos_aarch64.so: build-libaltos
+	-rm -f "$@"
+	$(LN_S) ../libaltos/.libs/"$@" .
+
+libaltos_armel.so: build-libaltos
+	-rm -f "$@"
+	$(LN_S) ../libaltos/.libs/"$@" .
+
+libaltos_armhf.so: build-libaltos
 	-rm -f "$@"
 	$(LN_S) ../libaltos/.libs/"$@" .
 
@@ -273,6 +285,7 @@ altos64.dll: ../libaltos/altos64.dll
 
 build-libaltos:
 	+cd ../libaltos && make libaltos.la
+
 build-altos-dll:
 	+cd ../libaltos && make altos.dll
 
@@ -315,7 +328,8 @@ $(MACOSX_DIST): $(MACOSX_FILES)
 	cp -a MicroPeak.app macosx/
 	cp -a $(MACOSX_README) macosx/ReadMe-MicroPeak.rtf
 	cp -a $(MACOSX_INSTALL) macosx
-	cp -a $(DOC) macosx
+	mkdir -p macosx/Doc
+	cp -a $(DOC) macosx/Doc
 	cp -p Info.plist macosx/MicroPeak.app/Contents
 	cp -p $(MACOSX_DRIVERS) macosx
 	mkdir -p macosx/MicroPeak.app/Contents/Resources/Java