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, 19 deletions

diff --git a/base/gxfapi.h b/base/gxfapi.h
index 20737d435..61100279e 100644
--- a/base/gxfapi.h
+++ b/base/gxfapi.h
@@ -17,25 +17,13 @@
 #define gxfapi_INCLUDED
 
 #include "gsmemory.h"
-#include "gsmatrix.h"
 #include "gsccode.h"
 #include "stdint_.h"
 #include "gsgstate.h"
+#include "gsfont.h"
+#include "gstext.h"
 
-#ifndef gs_font_base_DEFINED
-#  define gs_font_base_DEFINED
 typedef struct gs_font_base_s gs_font_base;
-#endif
-
-#ifndef gs_text_enum_DEFINED
-#  define gs_text_enum_DEFINED
-typedef struct gs_text_enum_s gs_text_enum_t;
-#endif
-
-#ifndef gs_font_DEFINED
-#  define gs_font_DEFINED
-typedef struct gs_font_s gs_font;
-#endif
 
 typedef int fracint;            /* A fractional integer with statically unknown number of fraction bits.
                                    The number of bits depends on plugin and is being specified in
@@ -285,11 +273,6 @@ typedef struct
     int black_width, black_height;
 } gs_fapi_raster;
 
-#ifndef gs_fapi_server_DEFINED
-#define gs_fapi_server_DEFINED
-typedef struct gs_fapi_server_s gs_fapi_server;
-#endif
-
 typedef enum gs_fapi_descendant_code_s
 {                               /* Possible values are descendant font indices and 4 ones defined below. */
     gs_fapi_descendant_prepared = -1,   /* See FAPI_prepare_font in zfapi.c . */