Remove some blah_DEFINED cruft.

Now we properly "include what we use" let's sanitise the horrid
blah_DEFINED ifdeffery (i.e. kill it where possible).

Also, we update the .c dependencies in the base/psi makefiles to
be correct.

Unfortunately, this new correct set of dependencies causes nmake
to soil itself and die with an out of memory error. After much
experimentation, I've come to the conclusion that this is because
it copes poorly with given the same file as a dependency multiple
times.

Sadly, our style of declaring dependencies in the following style:

 foo_h=$(BLAH)/foo.h $(std_h)
 bar_h=$(BLAH)/bar.h $(foo_h) $(std_h)
 baz_h=$(BLAH)/baz.h $(foo_h) $(std_h)

means that a .obj file that depends on $(foo_h) $(bar_h) and $(baz_h)
ends up depending on foo.h twice, and std.h three times.

I have therefore changed the style of dependencies used to be more
standard.

We still define:

 foo_h=$(BLAH)/foo.h

so each .obj file rule can depend on $(foo_h) etc as required, but the
dependencies between each .h file are expressed in normal rules at the
end of the file in a dedicated "# Dependencies" section that we can now
autogenerate.

1 files changed, 2 insertions, 17 deletions

diff --git a/base/gsfont.h b/base/gsfont.h
index cfb883a25..971eb225e 100644
--- a/base/gsfont.h
+++ b/base/gsfont.h
@@ -22,26 +22,11 @@
 #include "std.h"
 #include "gsgstate.h"
 #include "gstypes.h"
-
-#ifndef gs_matrix_DEFINED
-#  define gs_matrix_DEFINED
-typedef struct gs_matrix_s gs_matrix;
-#endif
-
-/* A 'font directory' object (to avoid making fonts global). */
-/* 'directory' is something of a misnomer: this structure */
-/* just keeps track of the defined fonts, and the scaled font and */
-/* rendered character caches. */
-#ifndef gs_font_dir_DEFINED
-#  define gs_font_dir_DEFINED
-typedef struct gs_font_dir_s gs_font_dir;
-#endif
+#include "gsmatrix.h"
+#include "gslibctx.h"
 
 /* Font objects */
-#ifndef gs_font_DEFINED
-#  define gs_font_DEFINED
 typedef struct gs_font_s gs_font;
-#endif
 
 /* Initialization */
 /* These procedures return 0 if they fail. */