changeset 1623:032cdfc4f017

Various build fixes.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 09 Mar 2016 20:13:32 +0200
parents a7d89044ee1b
children 6632f32db8a3
files old/Makefile world/Makefile
diffstat 2 files changed, 14 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/old/Makefile	Wed Mar 09 19:34:00 2016 +0200
+++ b/old/Makefile	Wed Mar 09 20:13:32 2016 +0200
@@ -15,7 +15,7 @@
 #
 TARGETS=batmap.html batmap.htm batmap.ansi \
 	hcbat.html hcbat.htm hcbat.ansi \
-	batcity.html
+	batcity.html util.js
 
 all: $(TARGETS)
 
@@ -29,14 +29,10 @@
 
 
 batmap.map: batmap-30-11-2006.txt
-	ln -s $< $@
-	
-tooltip.js: ../tooltip.js
-	ln -s $< $@
+	@ln -s $< $@
 
 title.png: $(MAP_PATH)title.png
-	ln -s $< $@
-
+	@ln -s $< $@
 
 batcity.html: batcity.map batcity.loc tooltip.js
 	$(MKCITYMAP_BIN) -T -t "Old BatCity map" -u ../www/urchin.inc.php $< batcity.loc -o "$@"
@@ -62,9 +58,12 @@
 #
 # Special targets
 #
+%.js: ../%.js
+	@ln -s $< $@
+
 upload: $(TARGETS) *.loc
-	scp -C $? $(UPLOAD_URL)
-	touch $@
+	@scp -C $? $(UPLOAD_URL)
+	@touch $@
 
 clean:
 	$(RM) $(TARGETS) *.o
--- a/world/Makefile	Wed Mar 09 19:34:00 2016 +0200
+++ b/world/Makefile	Wed Mar 09 20:13:32 2016 +0200
@@ -43,8 +43,8 @@
 
 # Upload changed files to site
 upload: $(TARGETS) renardy.map tormentas.map $(LOCLIST) util.js
-	scp -C $? $(UPLOAD_URL)
-	touch $@
+	@scp -C $? $(UPLOAD_URL)
+	@touch $@
 
 # Open PNG files in Gimp
 gimp: $(addsuffix .png,$(MAPLIST))
@@ -54,7 +54,7 @@
 
 # Upload only *.loc files
 uploc: $(LOCLIST)
-	scp $+ $(UPLOAD_URL)
+	@scp $+ $(UPLOAD_URL)
 
 # Fetch raw ASCII maps from bat.org to *.new
 fetch:
@@ -80,6 +80,9 @@
 diff: cleardiff $(addsuffix .diff,$(MAPMAP))
 	@hg diff .
 
+%.js: ../%.js
+	@ln -s $< $@
+
 # Clean temporary and generated targets
 clean:
 	$(RM) $(TARGETS) *.diff *.ppm *.o *.script