Merge branch 'master' into branch-1.9

[fw/altos] / map-server / altos-mapj / Makefile.am

diff --git a/map-server/altos-mapj/Makefile.am b/map-server/altos-mapj/Makefile.am
index 98d4f170d828d326d6e072ea9d68d99a66fd538b..0c823d035c8073078141b96b44a4617f14a3f861 100644 (file)
--- 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)"
@@ -49,6 +51,14 @@ altos-mapj: Makefile
        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)"' >> $@
@@ -66,3 +76,5 @@ $(ALTOSLIB_CLASS):
        -rm -f "$@"
        $(LN_S) ../../altoslib/"$@" .
 
+clean::
+       rm -f Manifest.txt Manifest-fat.txt