From: Keith Packard <keithp@keithp.com>
Date: Sun, 22 Mar 2020 04:13:08 +0000 (-0700)
Subject: map-server: Create Manifest.txt at build time
X-Git-Tag: 1.9.3~1^2~47
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=455a059b9c44332b8dadd87fba31d194f66997b5;p=fw%2Faltos

map-server: Create Manifest.txt at build time

This ensures the libraries have the right names

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/map-server/altos-mapd/Makefile.am b/map-server/altos-mapd/Makefile.am
index bb20dd84..3f1c6515 100644
--- a/map-server/altos-mapd/Makefile.am
+++ b/map-server/altos-mapd/Makefile.am
@@ -60,6 +60,10 @@ altos-mapd: Makefile
 	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)"' >> $@
diff --git a/map-server/altos-mapd/Manifest.txt b/map-server/altos-mapd/Manifest.txt
deleted file mode 100644
index 42c0313b..00000000
--- a/map-server/altos-mapd/Manifest.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Main-Class: altosmapd.AltosMapd
-Class-Path: altoslib_13.jar
diff --git a/map-server/altos-mapj/Makefile.am b/map-server/altos-mapj/Makefile.am
index a8dfffec..2080c747 100644
--- a/map-server/altos-mapj/Makefile.am
+++ b/map-server/altos-mapj/Makefile.am
@@ -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)"' >> $@
diff --git a/map-server/altos-mapj/Manifest.txt b/map-server/altos-mapj/Manifest.txt
deleted file mode 100644
index 1a285b40..00000000
--- a/map-server/altos-mapj/Manifest.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Main-Class: altosmap.AltosMap
-Class-Path: altoslib_13.jar