X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=micropeak%2FMakefile.am;h=7e9b490d326a2bc367226d521ac802233a72ebe0;hb=2c19d410f9d6ff1075ea2de0c0ad7b6a84e1e378;hp=6f674b19fd952aa8e7db451bccf0f1eb315ea117;hpb=43e2275250d9c91560a770942f3c06a8f74ed501;p=fw%2Faltos diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am index 6f674b19..7e9b490d 100644 --- a/micropeak/Makefile.am +++ b/micropeak/Makefile.am @@ -103,7 +103,7 @@ clean-local: altoslib_*.jar altosuilib_*.jar \ $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \ micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log \ - micropeak-windows.nsi *.desktop $(MDWN) + micropeak-windows.nsi *.desktop *.mdwn EXTRA_DIST = $(desktop_file).in @@ -137,7 +137,8 @@ MACOSX_DRIVERS=$(MACOSX_DRIVER_1) $(MACOSX_DRIVER_0) MACOSX_INFO_PLIST=Info.plist MACOSX_README=ReadMe-Mac.rtf -MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVERS) $(MACOSX_README) $(DOC) $(MACOSX_ICONS) +MACOSX_INSTALL=../altosui/install-macosx +MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVERS) $(MACOSX_README) $(DOC) $(MACOSX_ICONS) $(MACOSX_INSTALL) $(MACOSX_DRIVER_0): wget -O $@ $(MACOSX_DRIVER_0_URL) @@ -221,12 +222,18 @@ $(JAR): classmicropeak.stamp Manifest.txt $(JAVA_ICONS) $(ALTOSLIB_CLASS) $(ALTO $(ICONJAR) \ -C classes org \ -C ../libaltos libaltosJNI +if STRIP_NONDETERMINISM + $(STRIP_NONDETERMINISM) $@ +endif $(FATJAR): classmicropeak.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(JAVA_ICONS) jar cfm $@ Manifest-fat.txt \ $(ICONJAR) \ -C classes org \ -C ../libaltos libaltosJNI +if STRIP_NONDETERMINISM + $(STRIP_NONDETERMINISM) $@ +endif classaltosui.stamp: $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) @@ -306,7 +313,8 @@ $(MACOSX_DIST): $(MACOSX_FILES) -rm -rf macosx mkdir macosx cp -a MicroPeak.app macosx/ - cp -a $(MACOSX_README) macosx/ReadMe.rtf + cp -a $(MACOSX_README) macosx/ReadMe-MicroPeak.rtf + cp -a $(MACOSX_INSTALL) macosx cp -a $(DOC) macosx cp -p Info.plist macosx/MicroPeak.app/Contents cp -p $(MACOSX_DRIVERS) macosx