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

    didn't like sub-subdirs in SUBDIRS.

4 files changed, 98 insertions, 63 deletions

diff --git a/ChangeLog b/ChangeLog
index b8e9d79..d5e51be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-02  Keith Packard  <keithp@keithp.com>
+
+	* Makefile.am:
+	* configure.ac:
+	* src/Makefile.am:
+	Build libXfont.la in the 'src' directory as my
+	version of automake really didn't like sub-subdirs
+	in SUBDIRS.
+
 2005-07-03  Daniel Stone  <daniel@freedesktop.org>
 
 	* xfont.pc.in:
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 = \
diff --git a/configure.ac b/configure.ac
index 1b627d2..8dba286 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,6 +152,7 @@ CFLAGS="$CFLAGS $XFONT_CFLAGS"
 LIBS="$LIBS $XFONT_LIBS"
 
 AC_OUTPUT([Makefile
+	   src/Makefile
 	   src/fontcache/Makefile
 	   src/fontfile/Makefile
 	   src/FreeType/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..e7762d6
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,87 @@
+# 
+#  $Id$
+# 
+#  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_FONTCACHE
+FONTCACHE_DIR = fontcache
+FONTCACHE_LIB = fontcache/libfontcache.la
+endif
+
+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
+
+if XFONT_TYPE1
+TYPE1_DIR = Type1
+TYPE1_LIB = Type1/libtype1.la
+endif
+
+if XFONT_SPEEDO
+SPEEDO_DIR = Speedo
+SPEEDO_LIB = Speedo/libspeedo.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) $(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
+