update headers to whats required

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 936937cd55ec445685f64a4fdbe83c759e4a9378..959a8433b2c956c52eebfb24b8833f0aadc791c1 100644 (file)
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -26,7 +26,7 @@ configuration.o: configuration.cc configuration.hh util.hh
 focuswidget.o: focuswidget.cc focuswidget.hh widget.hh rect.hh \
  point.hh texture.hh color.hh util.hh style.hh font.hh image.hh \
  screeninfo.hh timer.hh configuration.hh
 focuswidget.o: focuswidget.cc focuswidget.hh widget.hh rect.hh \
  point.hh texture.hh color.hh util.hh style.hh font.hh image.hh \
  screeninfo.hh timer.hh configuration.hh

-font.o: font.cc font.hh util.hh gccache.hh display.hh color.hh \
+font.o: font.cc font.hh util.hh display.hh display.hh color.hh \

  screeninfo.hh rect.hh point.hh
 gccache.o: gccache.cc gccache.hh display.hh color.hh assassin.hh \
  screeninfo.hh rect.hh point.hh
  screeninfo.hh rect.hh point.hh
 gccache.o: gccache.cc gccache.hh display.hh color.hh assassin.hh \
  screeninfo.hh rect.hh point.hh

diff --git a/otk/font.cc b/otk/font.cc
index 121f4fa7b5bb77449c6d2888f909c602eb5be2f8..a68aeba2b0c75c5621e3240baeb67830a15845f6 100644 (file)
--- a/otk/font.cc
+++ b/otk/font.cc
@@ -19,7 +19,7 @@ using std::endl;
 
 #include "font.hh"
 #include "util.hh"
 
 #include "font.hh"
 #include "util.hh"

-#include "gccache.hh"
+#include "display.hh"

 #include "color.hh"
 #include "screeninfo.hh"
 
 #include "color.hh"
 #include "screeninfo.hh"