[Wesnoth-cvs-commits] wesnoth ./Makefile.am graphincludes/project/wes...

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/03/31 22:36:07

Modified files:
        .              : Makefile.am 
        graphincludes/project: wesnoth.pm 

Log message:
        Make use of features from newly-released graph-includes 0.2: excuses 
for abusive deps.  Also add a couple of additional source files into groups

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/Makefile.am.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/graphincludes/project/wesnoth.pm.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: wesnoth/Makefile.am
diff -u wesnoth/Makefile.am:1.28 wesnoth/Makefile.am:1.29
--- wesnoth/Makefile.am:1.28    Mon Mar 28 19:54:06 2005
+++ wesnoth/Makefile.am Thu Mar 31 22:36:07 2005
@@ -105,6 +105,6 @@
 # latest graph-includes.pl can be found currently at 
http://ydirson.free.fr/soft/wesnoth/graphs/
 wesnoth-deps.dot:
        (cd $(top_srcdir) && graph-includes --verbose --class wesnoth --group 
1-1 \
-       `find src -name '*.[ch]pp'|sed 's,\./,,'`) > $@
+         --prefixstrip src/ `find src -name '*.[ch]pp'`) > $@
 %.ps: %.dot
        dot -Tps $< > $@
Index: wesnoth/graphincludes/project/wesnoth.pm
diff -u wesnoth/graphincludes/project/wesnoth.pm:1.2 
wesnoth/graphincludes/project/wesnoth.pm:1.3
--- wesnoth/graphincludes/project/wesnoth.pm:1.2        Tue Mar 29 20:49:57 2005
+++ wesnoth/graphincludes/project/wesnoth.pm    Thu Mar 31 22:36:07 2005
@@ -27,14 +27,18 @@
       return $1;
     } elsif ($file =~ m!^(mapgen|mapgen_dialog|cavegen|map_create)\..*!) {
       return 'mapcreator';
-    } elsif ($file =~ 
m!^(array|astarnode|config|filesystem|game_config|gettext|global|language|log|map|pathfind|pathutils|race|random|scoped_resource|terrain|thread|unit|util|variable|wassert|(.*/xcoll))\..*!)
 {
+    } elsif ($file =~ 
m!^(array|astarnode|config|filesystem|game_config|gettext|global|language|log|map|pathfind|pathutils|race|random|scoped_resource|terrain|thread|tstring|unit|unit_types|util|variable|wassert|(.*/xcoll))\..*!)
 {
       return 'core';
     } elsif ($file =~ 
m!^(clipboard|cursor|font|image|sdl_utils|tooltips|video)\..*!) {
       return 'graphics';
-    } elsif ($file =~ m!^(events|preferences|show_dialog)\..*!) {
-      return 'guicore';
+    } elsif ($file =~ 
m!^(about|builder|display|events|preferences|show_dialog|sound|theme)\..*!) {
+      return 'uicore';
+    } elsif ($file =~ m!^(game|help|titlescreen)\..*!) {
+      return 'gameclient';
     } elsif ($file =~ m!^(editor|server|serialization|widgets)/.*!) {
       return $1;
+    } else {
+      return '<' . $self->filelabel($file, $level - 1) . '>';
     }
   }
   return undef;
@@ -51,7 +55,7 @@
 
                graphics      => 'peachpuff',
                widgets       => 'linen',
-               guicore       => 'lavenderblush',
+               uicore       => 'lavenderblush',
 
                multiplayer   => 'palegreen',
 
@@ -61,4 +65,10 @@
   return @colors;
 }
 
+sub ignored_deps {
+  return {'src/font.cpp' => {'src/team.hpp' => 'team colors' },
+         'src/language.cpp' => {'src/preferences.hpp' => 'split out graph. 
stuff from preferences'},
+        };
+}
+
 1;