X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=map-server%2Faltos-mapd%2FMakefile.am;h=f92c3e5ac917538778e00d6fbf6d8953453e4f3e;hb=9cc485e9454af7c09c0b35e7ae4d1c718158a38e;hp=a3fd196ecfd036c27607e7a59804d858aa5c9004;hpb=a203aa6e3ed67337b752f939da956856e208c28b;p=fw%2Faltos

diff --git a/map-server/altos-mapd/Makefile.am b/map-server/altos-mapd/Makefile.am
index a3fd196e..f92c3e5a 100644
--- a/map-server/altos-mapd/Makefile.am
+++ b/map-server/altos-mapd/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
 
@@ -22,6 +22,14 @@ FATJAR=altosmapd-fat.jar
 
 all-local: classes/altosmapd $(JAR) altos-mapd altos-mapd-test altos-mapd-jdb
 
+defaultsdir=$(sysconfdir)/default
+
+defaults_DATA=altos-mapd-default
+
+systemddir=$(libdir)/systemd/system
+
+systemd_DATA=altos-mapd.service
+
 install-altosmapdJAVA: altosmapd.jar
 	@$(NORMAL_INSTALL)
 	test -z "$(altosmapddir)" || $(MKDIR_P) "$(DESTDIR)$(altosmapddir)"
@@ -34,18 +42,28 @@ classes/altosmapd:
 $(JAR): classaltosmapd.stamp Manifest.txt $(ALTOSLIB_CLASS)
 	jar cfm $@ Manifest.txt \
 		-C classes altosmapd
+if STRIP_NONDETERMINISM
+	$(STRIP_NONDETERMINISM) $@
+endif
 
 altosmapddir=$(datadir)/java
 
 $(FATJAR): classaltosmapd.stamp Manifest-fat.txt $(ALTOSLIB_CLASS)
 	jar cfm $@ Manifest-fat.txt \
 		-C classes altosmapd
+if STRIP_NONDETERMINISM
+	$(STRIP_NONDETERMINISM) $@
+endif
 
 altos-mapd: Makefile
 	echo "#!/bin/sh" > $@
 	echo 'exec java -Djava.library.path="$(altoslibdir)" -jar "$(altosmapddir)/altosmapd.jar" "$$@"' >> $@
 	chmod +x $@
 
+Manifest.txt: Makefile
+	echo 'Main-Class: altosmapd.AltosMapd' > $@
+	echo "Class-Path: $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS)" >> $@
+
 altos-mapd-test: Makefile
 	echo '#!/bin/sh' > $@
 	echo 'dir="$$(dirname $$0)"' >> $@
@@ -63,3 +81,6 @@ $(ALTOSLIB_CLASS):
 	-rm -f "$@"
 	$(LN_S) ../../altoslib/"$@" .
 
+
+clean::
+	rm -f Manifest.txt