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 bb20dd845886ec795c4234006890f2351748b41a..3f1c65158e995507d978f01c1c78236eb76b728a 100644 (file)
--- 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 (file)
index 42c0313..0000000
--- 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 a8dfffecc55a37a924ec469fe2ebe21e7a1893ae..2080c747001aae30db58ddd420d89f7cbfadc34f 100644 (file)
--- 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 (file)
index 1a285b4..0000000
--- a/map-server/altos-mapj/Manifest.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Main-Class: altosmap.AltosMap
-Class-Path: altoslib_13.jar