More things move to core directory.

data/tools/Makefile

@@ -3,7 +3,7 @@
 # Hack this if our location in the Wesnoth source tree changes.
 # It needs to point to the top-level directory, e.g. with data/images/sounds
 # directly beneath it. 
-TOPDIR = ../../
+TOPDIR = ../../data/core ../../data/campaigns/*
 # Define this to point to a local copy of UMC to run checks on.
 # Note, this needs to expand to a list with one subdirectory per UMC campaign,
 # otherwise the visibility checks aren't going to work right.
@@ -13,41 +13,38 @@ TOPDIR = ../../
 # So suppress reporting them unused even if they seem to have
 # no references.  Likewise for resources used only by the C++ GUI.
 FAKE = --force-used "(terrain|buttons|cursors|cursors-bw|menu)/"
-# Suppress meaningless errors about castle graphics and about resources 
-# used only by the GUI code in C++
-EXCLUDE = --exclude ".dirstamp|po/|translations/|exploder/|castle-cutter/|icons/|UI/"
 
 unresolved:
 	@echo "# Report on unresolved macro calls and resource references"
-	@./wmlscope --unresolved $(EXCLUDE) $(TOPDIR) $(UMC)
+	@./wmlscope --unresolved $(TOPDIR) $(UMC)
 
 all:
 	@echo "# Report on usage of all macros and resources"
-	@./wmlscope --crossreference $(EXCLUDE) $(TOPDIR) $(UMC)
+	@./wmlscope --crossreference $(TOPDIR) $(UMC)
 
 utils-unused:
 	@echo "# Report on unused utility macros"
-	@./wmlscope --crossreference --from $(TOPDIR)data/utils --refcount 0 $(FAKE) $(EXCLUDE) $(TOPDIR) $(UMC)
+	@./wmlscope --crossreference --from $(TOPDIR)data/utils --refcount 0 $(FAKE) $(TOPDIR) $(UMC)
 
 all-unused:
 	@echo "# Report on unused resource files"
-	@./wmlscope --crossreference --refcount 0 $(FAKE) $(EXCLUDE) $(TOPDIR) $(UMC)
+	@./wmlscope --crossreference --refcount 0 $(FAKE) $(TOPDIR) $(UMC)
 
 utils-macros:
 	@echo "# Report on usage of utility macros"
-	@./wmlscope --crossreference --from $(TOPDIR)data/utils $(EXCLUDE) $(TOPDIR) $(UMC)
+	@./wmlscope --crossreference --from $(TOPDIR)data/utils $(TOPDIR) $(UMC)
 
 collisions:
 	@echo "# Report on duplicate resource files."
-	@./wmlscope --collisions $(EXCLUDE) $(TOPDIR) $(UMC)
+	@./wmlscope --collisions $(TOPDIR) $(UMC)
 
 # Report a list of symbols and resources defined in mainline.
 definitions:
-	@./wmlscope --definitions --exclude data/scenarios --exclude data/campaigns $(EXCLUDE) $(TOPDIR)
+	@./wmlscope --definitions --exclude data/scenarios --exclude data/campaigns $(TOPDIR)
 
 # Generate a reference page for the utility macros.
 macro-reference.xhtml:
 	@cat helpheader.xhtml >macro-reference.xhtml
-	@./wmlscope --extracthelp --exclude data/scenarios --exclude data/tutorial --exclude data/campaigns $(EXCLUDE) $(TOPDIR) >>macro-reference.xhtml
+	@./wmlscope --extracthelp --exclude data/scenarios --exclude data/tutorial --exclude data/campaigns $(TOPDIR) >>macro-reference.xhtml
 	@cat helptrailer.xhtml >>macro-reference.xhtml