9 files changed, 40 insertions, 77 deletions
diff --git a/libXfont/config.h b/libXfont/config.h
new file mode 100644
index 000000000..5f85c98d4
--- /dev/null
+++ b/libXfont/config.h
@@ -0,0 +1,29 @@
+/* Support bdf format bitmap font files */
+#define XFONT_BDFFORMAT 1
+
+/* Support bitmap font files */
+#define XFONT_BITMAP 1
+
+/* Support built-in fonts */
+#define XFONT_BUILTINS 1
+
+/* Support the X Font Services Protocol */
+#define XFONT_FC 1
+
+/* Support fonts in files */
+#define XFONT_FONTFILE 1
+
+/* Support FreeType rasterizer for nearly all font file formats */
+#define XFONT_FREETYPE 1
+
+/* Support pcf format bitmap font files */
+#define XFONT_PCFFORMAT 1
+
+/* Support snf format bitmap font files */
+#define XFONT_SNFFORMAT 1
+
+/* Support bzip2 for bitmap fonts */
+#undef X_BZIP2_FONT_COMPRESSION
+
+/* Support gzip for bitmap fonts */
+#define X_GZIP_FONT_COMPRESSION 1
diff --git a/libXfont/src/FreeType/makefile b/libXfont/src/FreeType/makefile
index a1f05a560..8d4fee2b6 100644
--- a/libXfont/src/FreeType/makefile
+++ b/libXfont/src/FreeType/makefile
@@ -10,5 +10,6 @@ INCLUDES += $(MHMAKECONF)\freetype\include\freetype  $(MHMAKECONF)\freetype\incl
 
 DEFINES += strcasecmp=_stricmp
 
-INCLUDES := ../../../../build $(INCLUDES)
+INCLUDES := ../.. $(INCLUDES)
+
 
diff --git a/libXfont/src/bitmap/makefile b/libXfont/src/bitmap/makefile
index 9faa86a30..f7ea10fdc 100644
--- a/libXfont/src/bitmap/makefile
+++ b/libXfont/src/bitmap/makefile
@@ -12,9 +12,5 @@ CSRCS = 		\
 	pcfwrite.c		\
 	snfread.c
 
-#DEFINES += XFONT_PCFFORMAT XFONT_SNFFORMAT XFONT_BDFFORMAT X_GZIP_FONT_COMPRESSION
-
-INCLUDES := ../../../../build $(INCLUDES)
-
-#INCLUDE=$(INCLUDE);..\..\include\X11;..\..\src\xlibi18n;..\..\src
+INCLUDES := ../.. $(INCLUDES)
 
diff --git a/libXfont/src/builtins/makefile b/libXfont/src/builtins/makefile
index bde6d880f..dac4fcf8c 100644
--- a/libXfont/src/builtins/makefile
+++ b/libXfont/src/builtins/makefile
@@ -6,5 +6,5 @@ CSRCS = dir.c			\
 	fpe.c			\
 	render.c
 
-INCLUDES := ../../../../build $(INCLUDES)
+INCLUDES := ../.. $(INCLUDES)
 
diff --git a/libXfont/src/fc/makefile b/libXfont/src/fc/makefile
index 51b78369c..b9481dad9 100644
--- a/libXfont/src/fc/makefile
+++ b/libXfont/src/fc/makefile
@@ -5,5 +5,5 @@ CSRCS = fsconvert.c		\
 	fsio.c			\
 	fstrans.c
 
-INCLUDES := ../../../../build $(INCLUDES)
+INCLUDES := ../.. $(INCLUDES)
 
diff --git a/libXfont/src/fontfile/makefile b/libXfont/src/fontfile/makefile
index 12e289d30..6468ff9b5 100644
--- a/libXfont/src/fontfile/makefile
+++ b/libXfont/src/fontfile/makefile
@@ -21,5 +21,6 @@ CSRCS = bitsource.c		\
 	renderers.c		\
 	catalogue.c
 
-INCLUDES := ../../../../build $(INCLUDES)
+INCLUDES := ../.. $(INCLUDES)
+
 
diff --git a/libXfont/src/makefile b/libXfont/src/makefile
deleted file mode 100644
index 3bc7fb3e7..000000000
--- a/libXfont/src/makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# 
-#  Copyright © 2003 Keith Packard, Noah Levitt
-# 
-#  Permission to use, copy, modify, distribute, and sell this software and its
-#  documentation for any purpose is hereby granted without fee, provided that
-#  the above copyright notice appear in all copies and that both that
-#  copyright notice and this permission notice appear in supporting
-#  documentation, and that the name of Keith Packard not be used in
-#  advertising or publicity pertaining to distribution of the software without
-#  specific, written prior permission.  Keith Packard makes no
-#  representations about the suitability of this software for any purpose.  It
-#  is provided "as is" without express or implied warranty.
-# 
-#  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-#  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-#  PERFORMANCE OF THIS SOFTWARE.
-
-lib_LTLIBRARIES = libXfont.la
-
-if XFONT_FONTFILE
-FONTFILE_DIR = fontfile
-FONTFILE_LIB = fontfile/libfontfile.la
-endif
-
-if XFONT_FREETYPE
-FREETYPE_DIR = FreeType
-FREETYPE_LIB = FreeType/libft.la
-endif
-
-if XFONT_BITMAP
-BITMAP_DIR = bitmap
-BITMAP_LIB = bitmap/libbitmap.la
-endif
-
-if XFONT_BUILTINS
-BUILTINS_DIR = builtins
-BUILTINS_LIB = builtins/libbuiltins.la
-endif
-
-if XFONT_FC
-FC_DIR = fc
-FC_LIB = fc/libfc.la
-endif
-
-UTIL_DIR = util
-UTIL_LIB = util/libutil.la
-
-STUBS_LIB = stubs/libstubs.la
-STUBS_DIR = stubs
-
-SUBDIRS=\
-	$(FONTFILE_DIR) $(FREETYPE_DIR) $(BITMAP_DIR) \
-	$(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR)
-
-libXfont_la_LIBADD = \
-	$(FONTFILE_LIB) $(FREETYPE_LIB) $(BITMAP_LIB) \
-	$(BUILTINS_LIB) $(FC_LIB) $(UTIL_LIB) $(STUBS_LIB) \
-	$(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS)
-
-libXfont_la_SOURCES = dummy.c
-
-libXfont_la_LDFLAGS = -version-number 1:4:1 -no-undefined
diff --git a/libXfont/src/stubs/makefile b/libXfont/src/stubs/makefile
index 64e4a33b9..e028dd5db 100644
--- a/libXfont/src/stubs/makefile
+++ b/libXfont/src/stubs/makefile
@@ -21,5 +21,6 @@ CSRCS = 		\
 
 CSRCS:=$(filter-out %.h,$(CSRCS))
 
-INCLUDES := ../../../../build $(INCLUDES)
+INCLUDES := ../.. $(INCLUDES)
+
 
diff --git a/libXfont/src/util/makefile b/libXfont/src/util/makefile
index 69cbeac95..323daef95 100644
--- a/libXfont/src/util/makefile
+++ b/libXfont/src/util/makefile
@@ -5,6 +5,7 @@ INCLUDES += ../stubs
 CSRCS = atom.c fontaccel.c fontnames.c fontutil.c fontxlfd.c format.c miscutil.c \
 	patcache.c private.c utilbitmap.c
 
-INCLUDES := ../../../../build $(INCLUDES)
+INCLUDES := ../.. $(INCLUDES)
+