Mercurial > hg > batmud > maputils

changeset 1884:32033f5c65e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Build cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 04 Nov 2017 21:30:48 +0200
parents cb13335d85cf
children a0d7b4c63fd4
files Makefile.gen
diffstat 1 files changed, 10 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.gen	Sat Nov 04 20:43:20 2017 +0200
+++ b/Makefile.gen	Sat Nov 04 21:30:48 2017 +0200
@@ -8,6 +8,13 @@
 
 
 ###
+### List of map targets
+###
+MAP_FILES=votk faerieforest lanzia rilynttar lorenchia \
+	esiris arelium calythien tyr_farwyn dortlewall
+
+
+###
 ### Objects
 ###
 MKSPECIAL_BIN=$(BINPATH)mkspecial$(EXEEXT)
@@ -21,26 +28,15 @@
 MAPSTATS_BIN=$(BINPATH)mapstats$(EXEEXT)
 MAPSEARCH_BIN=$(BINPATH)mapsearch$(EXEEXT)
 
-
-MAP_FILES=votk.html votk.map \
-	faerieforest.html faerieforest.map \
-	lanzia.html lanzia.map \
-	rilynttar.html rilynttar.map \
-	lorenchia.html lorenchia.map \
-	esiris.html esiris.map \
-	arelium.html arelium.map \
-	calythien.html calythien.map \
-	tyr_farwyn.html	tyr_farwyn.map \
-	dortlewall.html dortlewall.map
-
 LIBLOCFILE_OBJ=$(OBJPATH)liblocfile.o
 LIBMAPUTILS_OBJ=$(OBJPATH)libmaputils.o
 
+
 TARGETS += $(LIBMAPUTILS_OBJ) $(LIBLOCFILE_OBJ) \
 	$(COLORMAP_BIN) $(MKSPECIAL_BIN) $(MKCITYMAP_BIN) \
 	$(DIFFMAP_BIN) $(PATCHMAP_BIN) $(MAP2PPM_BIN) \
 	$(MKLOC_BIN) $(COMBINE_BIN) $(MAPSTATS_BIN) \
-	$(addprefix $(MAP_PATH),$(filter %.html,$(MAP_FILES)))
+	$(addprefix $(MAP_PATH),$(addsuffix .html,$(MAP_FILES)))
 
 
 ifeq ($(HAVE_LIBWEBSOCKETS),yes)
@@ -92,7 +88,7 @@
 	@hg up
 	@hg2cl
 
-upload: tooltip.js $(addprefix $(MAP_PATH),$(MAP_FILES))
+upload: tooltip.js $(addprefix $(MAP_PATH),$(addsuffix .html,$(MAP_FILES))) $(addprefix $(MAP_PATH),$(addsuffix .map,$(MAP_FILES)))
 	@scp -C $? $(UPLOAD_URL)
 	@touch $@