changeset 67:8c79775ac44f

Updated Makefile
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 16 Dec 2006 06:13:10 +0000
parents 9a824e7d1463
children 404e652b0818
files maps/Makefile
diffstat 1 files changed, 17 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/maps/Makefile	Sat Dec 16 06:13:03 2006 +0000
+++ b/maps/Makefile	Sat Dec 16 06:13:10 2006 +0000
@@ -1,17 +1,18 @@
 #
 # Settings
 #
-TARGETS=laenor.html laenor.ansi roth.ansi roth.html lucentium.ansi lucentium.html furnachia.html furnachia.ansi
+TARGETS=laenor.html laenor.ansi		\
+	roth.ansi roth.html		\
+	luc.ansi luc.html		\
+	furn.html furn.ansi		\
+	deso.ansi deso.html
+
+UPURL=mhamalai@students.oamk.fi:public_html/bat/maps/
+
 BINPATH=../
 EXEEXT=
 
 
-LAENOR_DESC=Continent of Laenor @ BatMUD - mapdata by Ooga, locations and conversion by Ggr
-ROTH_DESC=Continent of Rothikgen @ BatMUD - mapdata by Ooga, locations and conversion by Ggr
-LUCENTIUM_DESC=Continent of Lucentium @ BatMUD - mapdata by Ooga, locations and conversion by Ggr
-FURNACHIA_DESC=Continent of Furnachia @ BatMUD - mapdata by Ooga, conversion by Ggr
-
-
 #
 # Utils
 #
@@ -25,59 +26,22 @@
 #
 all: $(TARGETS)
 
-laenor.tmp: laenor.map laenor.loc
-	$(MKLOC_BIN) -v -o $@ -m $< -l laenor.loc
-
-laenor.ansi: laenor.tmp $(COLORANSI_BIN)
-	echo "$(LAENOR_DESC)" > $@
-	$(COLORANSI_BIN) < $< >> $@
-	
-laenor.html: laenor.tmp $(COLORMAP_BIN)
-	$(COLORMAP_BIN) "$(LAENOR_DESC)" < $< > $@
-
-
-roth.tmp: roth.map roth.loc
-	$(MKLOC_BIN) -v -o $@ -m $< -l roth.loc
-
-roth.ansi: roth.tmp $(COLORANSI_BIN)
-	echo "$(ROTH_DESC)" > $@
-	$(COLORANSI_BIN) < $< >> $@
-	
-roth.html: roth.tmp $(COLORMAP_BIN)
-	$(COLORMAP_BIN) "$(ROTH_DESC)" < $< > $@
-
+%.tmp: %.map %.loc
+	$(MKLOC_BIN) -v -o $@ -m $< -l $(patsubst %.map,%.loc,$<)
+	scp $(patsubst %.map,%.loc,$<) $(UPURL)
 
-lucentium.tmp: lucentium.map lucentium.loc
-	$(MKLOC_BIN) -v -o $@ -m $< -l lucentium.loc
-
-lucentium.ansi: lucentium.tmp $(COLORANSI_BIN)
-	echo "$(LUCENTIUM_DESC)" > $@
+%.ansi: %.tmp %.desc $(COLORANSI_BIN)
+	echo `cat $(patsubst %.tmp,%.desc,$<)` > $@
 	$(COLORANSI_BIN) < $< >> $@
+	scp $@ $(UPURL)
 	
-lucentium.html: lucentium.tmp $(COLORMAP_BIN)
-	$(COLORMAP_BIN) "$(LUCENTIUM_DESC)" < $< > $@
-
-
-furnachia.tmp: furnachia.map furnachia.loc
-	$(MKLOC_BIN) -v -o $@ -m $< -l furnachia.loc
-
-furnachia.ansi: furnachia.tmp $(COLORANSI_BIN)
-	echo "$(FURNACHIA_DESC)" > $@
-	$(COLORANSI_BIN) < $< >> $@
-	
-furnachia.html: furnachia.tmp $(COLORMAP_BIN)
-	$(COLORMAP_BIN) "$(FURNACHIA_DESC)" < $< > $@
-
+%.html: %.tmp %.desc $(COLORMAP_BIN)
+	$(COLORMAP_BIN) "`cat $(patsubst %.tmp,%.desc,$<)`" < $< > $@
+	scp $@ $(UPURL)
 
 #
 # Special targets
 #
-upload: $(TARGETS) *.loc
-	scp $+ mhamalai@students.oamk.fi:public_html/bat/maps/
-
-#	scp $+ tnsp@irc.saitti.net:public_html/
-
-
 clean:
 	$(RM) -f $(TARGETS) *.o