X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=map-server%2Faltos-map%2FMakefile.am;fp=map-server%2Faltos-map%2FMakefile.am;h=6925957b537113982e539f431401ef72eb429e88;hp=f7c9bdc8523d40fccd731365c776cb06e2cb2185;hb=af678be97e419a1167a0630f28bcaba82d67929b;hpb=7b248524d4bd2c3ab64899b133230d131258396c

diff --git a/map-server/altos-map/Makefile.am b/map-server/altos-map/Makefile.am
index f7c9bdc8..6925957b 100644
--- a/map-server/altos-map/Makefile.am
+++ b/map-server/altos-map/Makefile.am
@@ -1,62 +1,6 @@
-JAVAROOT=classes
-AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
+bin_PROGRAMS = altos-map
 
-altoslibdir=$(libdir)/altos
-
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="$(JAVAROOT):../../altoslib/*"
-
-bin_SCRIPTS=altos-map
-
-altosmap_JAVA = \
-	AltosMap.java
-
-ALTOSLIB_CLASS=\
-	altoslib_$(ALTOSLIB_VERSION).jar
-
-JAR=altosmap.jar
-
-FATJAR=altosmap-fat.jar
-
-all-local: classes/altosmap $(JAR) altos-map altos-map-test altos-map-jdb
-
-install-altosmapJAVA: altosmap.jar
-	@$(NORMAL_INSTALL)
-	test -z "$(altosmapdir)" || $(MKDIR_P) "$(DESTDIR)$(altosmapdir)"
-	echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(altosmapdir)/altosmap.jar'"; \
-	$(INSTALL_DATA) "$<" "$(DESTDIR)$(altosmapdir)"
-
-classes/altosmap:
-	mkdir -p classes/altosmap
-
-$(JAR): classaltosmap.stamp Manifest.txt $(ALTOSLIB_CLASS)
-	jar cfm $@ Manifest.txt \
-		-C classes altosmap
-
-altosmapdir=$(datadir)/java
-
-$(FATJAR): classaltosmap.stamp Manifest-fat.txt $(ALTOSLIB_CLASS)
-	jar cfm $@ Manifest-fat.txt \
-		-C classes altosmap
-
-altos-map: Makefile
-	echo "#!/bin/sh" > $@
-	echo 'exec java -Djava.library.path="$(altoslibdir)" -jar "$(altosmapdir)/altosmap.jar" "$$@"' >> $@
-	chmod +x $@
-
-altos-map-test: Makefile
-	echo '#!/bin/sh' > $@
-	echo 'dir="$$(dirname $$0)"' >> $@
-	echo 'cd "$$dir"' >> $@
-	echo 'altosmap="$$(pwd -P)"' >> $@
-	echo 'exec java -jar "$$altosmap/altosmap.jar" "$$@"' >> $@
-	chmod +x $@
-
-altos-map-jdb: Makefile
-	echo "#!/bin/sh" > $@
-	echo 'exec jdb altosmap/AltosMap "$$@"' >> $@
-	chmod +x $@
-
-$(ALTOSLIB_CLASS):
-	-rm -f "$@"
-	$(LN_S) ../../altoslib/"$@" .
+altos_map_SOURCES = altos-map.c
 
+altos_map_LDADD = $(JANSSON_LIBS)
+altos_map_CFLAGS = $(JANSSON_CFLAGS) $(WARN_CFLAGS)