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, 3 insertions, 7 deletions

diff --git a/base/gsgdata.h b/base/gsgdata.h
index ac8d3414c..707030dca 100644
--- a/base/gsgdata.h
+++ b/base/gsgdata.h
@@ -20,6 +20,9 @@
 #  define gsgdata_INCLUDED
 
 #include "gsstype.h"		/* for extern_st */
+#include "gsfont.h"
+#include "gsgcache.h"
+#include "memento.h" /* Because of "free" used below */
 
 /*
  * Define the structure used to return the data for a glyph upon
@@ -53,10 +56,7 @@
 /* ------ Structure declaration ------ */
 
 typedef struct gs_glyph_data_procs_s gs_glyph_data_procs_t;
-#ifndef gs_glyph_data_DEFINED
-#   define gs_glyph_data_DEFINED
 typedef struct gs_glyph_data_s gs_glyph_data_t;
-#endif
 struct gs_glyph_data_s {
     gs_const_bytestring bits;	/* pointer to actual data returned here */
     const gs_glyph_data_procs_t *procs;
@@ -118,10 +118,6 @@ void gs_glyph_data_free(gs_glyph_data_t *pgd, client_name_t cname);
 /*
  * Initialize glyph data from a string or from bytes.
  */
-#ifndef gs_font_DEFINED
-#  define gs_font_DEFINED
-typedef struct gs_font_s gs_font;
-#endif
 void gs_glyph_data_from_string(gs_glyph_data_t *pgd, const byte *data,
                                uint size, gs_font *font);
 void gs_glyph_data_from_bytes(gs_glyph_data_t *pgd, const byte *bytes,