Build libXfont.la in the 'src' directory as my version of automake really

    didn't like sub-subdirs in SUBDIRS.

1 files changed, 1 insertions, 63 deletions

diff --git a/Makefile.am b/Makefile.am
index 86032b1..e4b4b63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,69 +21,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-lib_LTLIBRARIES = libXfont.la
-
-if XFONT_FONTCACHE
-FONTCACHE_DIR = src/fontcache
-FONTCACHE_LIB = src/fontcache/libfontcache.la
-endif
-
-if XFONT_FONTFILE
-FONTFILE_DIR = src/fontfile
-FONTFILE_LIB = src/fontfile/libfontfile.la
-endif
-
-if XFONT_FREETYPE
-FREETYPE_DIR = src/FreeType
-FREETYPE_LIB = src/FreeType/libft.la
-endif
-
-if XFONT_BITMAP
-BITMAP_DIR = src/bitmap
-BITMAP_LIB = src/bitmap/libbitmap.la
-endif
-
-if XFONT_BUILTINS
-BUILTINS_DIR = src/builtins
-BUILTINS_LIB = src/builtins/libbuiltins.la
-endif
-
-if XFONT_FC
-FC_DIR = src/fc
-FC_LIB = src/fc/libfc.la
-endif
-
-if XFONT_TYPE1
-TYPE1_DIR = src/Type1
-TYPE1_LIB = src/Type1/libtype1.la
-endif
-
-if XFONT_SPEEDO
-SPEEDO_DIR = src/Speedo
-SPEEDO_LIB = src/Speedo/libspeedo.la
-endif
-
-UTIL_DIR = src/util
-UTIL_LIB = src/util/libutil.la
-
-STUBS_LIB = src/stubs/libstubs.la
-STUBS_DIR = src/stubs
-
-SUBDIRS=$(FONTFILE_DIR) $(FREETYPE_DIR) $(BITMAP_DIR) \
-	$(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR) $(FONTCACHE_DIR) \
-	$(TYPE1_DIR) $(SPEEDO_DIR)
-
-libXfont_la_LIBADD = $(FREETYPE_LIB) $(BITMAP_LIB) $(BUILTINS_LIB) \
-	$(FC_LIB) $(FONTFILE_LIB) $(UTIL_LIB) $(STUBS_LIB) \
-	$(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(FONTCACHE_LIB) \
-	$(TYPE_1_LIB) $(SPEEDO_LIB)
-
-libXfont_la_SOURCES =
-
-#
-# Shared library version info.  This is not the same as the package version
-#
-libXfont_la_LDFLAGS = -version-number 1:4:1
+SUBDIRS=src
 
 libXfontincludedir = $(includedir)/X11/fonts
 libXfontinclude_HEADERS = \