X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=map-server%2Faltos-mapj%2FMakefile.am;h=0c823d035c8073078141b96b44a4617f14a3f861;hb=96181ff1e0d376d7a2c9519abbf4f346d8fd47ea;hp=f447adb629d52d24836ff4704942e464702a2ebb;hpb=af678be97e419a1167a0630f28bcaba82d67929b;p=fw%2Faltos

diff --git a/map-server/altos-mapj/Makefile.am b/map-server/altos-mapj/Makefile.am
index f447adb6..0c823d03 100644
--- a/map-server/altos-mapj/Makefile.am
+++ b/map-server/altos-mapj/Makefile.am
@@ -1,5 +1,5 @@
 JAVAROOT=classes
-AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
+AM_JAVACFLAGS=$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked
 
 altoslibdir=$(libdir)/altos
 
@@ -19,6 +19,8 @@ FATJAR=altosmap-fat.jar
 
 all-local: classes/altosmap $(JAR) altos-mapj altos-mapj-test altos-mapj-jdb
 
+fat: $(FATJAR)
+
 install-altosmapJAVA: altosmap.jar
 	@$(NORMAL_INSTALL)
 	test -z "$(altosmapdir)" || $(MKDIR_P) "$(DESTDIR)$(altosmapdir)"
@@ -31,18 +33,32 @@ classes/altosmap:
 $(JAR): classaltosmap.stamp Manifest.txt $(ALTOSLIB_CLASS)
 	jar cfm $@ Manifest.txt \
 		-C classes altosmap
+if STRIP_NONDETERMINISM
+	$(STRIP_NONDETERMINISM) $@
+endif
 
 altosmapdir=$(datadir)/java
 
 $(FATJAR): classaltosmap.stamp Manifest-fat.txt $(ALTOSLIB_CLASS)
 	jar cfm $@ Manifest-fat.txt \
 		-C classes altosmap
+if STRIP_NONDETERMINISM
+	$(STRIP_NONDETERMINISM) $@
+endif
 
 altos-mapj: Makefile
 	echo "#!/bin/sh" > $@
 	echo 'exec java -Djava.library.path="$(altoslibdir)" -jar "$(altosmapdir)/altosmap.jar" "$$@"' >> $@
 	chmod +x $@
 
+Manifest.txt: Makefile
+	echo 'Main-Class: altosmap.AltosMap' > $@
+	echo "Class-Path: $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS)" >> $@
+
+Manifest-fat.txt: Makefile
+	echo 'Main-Class: altosmap.AltosMap' > $@
+	echo "Class-Path: $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS)" >> $@
+
 altos-mapj-test: Makefile
 	echo '#!/bin/sh' > $@
 	echo 'dir="$$(dirname $$0)"' >> $@
@@ -60,3 +76,5 @@ $(ALTOSLIB_CLASS):
 	-rm -f "$@"
 	$(LN_S) ../../altoslib/"$@" .
 
+clean::
+	rm -f Manifest.txt Manifest-fat.txt