--- a/maps/Makefile	Fri Sep 25 06:05:37 2009 +0000
+++ b/maps/Makefile	Fri Sep 25 09:02:00 2009 +0000
@@ -9,7 +9,19 @@
 	$(patsubst %.map,%.ansi,$(MAPLIST)) \
 	$(patsubst %.map,%.png,$(MAPLIST))
 
-all: $(patsubst %.map,%.ppm,$(MAPLIST)) $(TARGETS)
+all:
+	@echo "Usage: make <maps|fetch|diff|upload>"
+	@echo
+	@echo "maps  : Build HTML, HTML+JS, PNG image and ANSI format maps."
+	@echo "fetch : Fetch latest raw ASCII map data from bat.org."
+	@echo "diff  : Do special diff operation between new data (gotten via 'fetch')"
+	@echo "        and update .loc files for each continent with new locations."
+	@echo "        A diff -u of new and old location files is outputted."
+	@echo "upload: Uploads map and loc-files via SCP to server specified in"
+	@echo "        ../config.mak"
+
+
+maps: $(patsubst %.map,%.ppm,$(MAPLIST)) $(TARGETS)
 
 
 #laenor.map:
@@ -18,26 +30,10 @@
 
 include Makefile.inc
 
-world.map: $(MAPLIST)
-	$(COMBINE_BIN) -v -f "~" $(MAPLISTOFFS) -o $@
-
-world.loc: $(patsubst %.map,%.loc,$(MAPLIST))
-	for i in $(MAPLISTOFFS); do $(MKLOC_BIN) -v -L -l `echo "$$i"|sed "s/^\([^\.]*\).map:.*/\1.loc/"` -m `echo "$$i"|sed "s/^\([^:]*\):\([0-9]*\):\([0-9]*\)/\1 -x \2 -y \3/"`; done > $@
-
-world.ppm: world.map
-	$(MAP2PPM_BIN) $< | convert ppm:- -resize "50%" $@
-
-world.script: world.map world.loc
-	$(MKLOC_BIN) -vnS -m $< -l $(patsubst %.map,%.loc,$<) -u $(WORLDUNITSIZE) -s $(WORLDMAPSCALE) | \
-	sed -e "s/@OPTS_START@/-font $(WORLDFONT) -pointsize 10 -type TruecolorMatte/g" \
-	-e "s/@OPTS_END@/\t-geometry +220+15 title.png -composite -compose screen \\\\\n\t-pointsize 30 -fill white -box none -draw \"text 10,30 \'\n@PAF@\n\n/g" | \
-	sed -e "/@PAF@/r $(patsubst %.map,%.desc,$<)" -e "s/@PAF@//g" > $@
-
-
 #
 # Special targets
 #
-upload: $(TARGETS) renardy.map *.loc world.jpg util.js
+upload: $(TARGETS) renardy.map *.loc util.js
 	scp -C $? $(UPURL)
 	touch $@