Convert to non-recursive build.

11 files changed, 114 insertions, 212 deletions

diff --git a/Makefile.am b/Makefile.am
index 43ccd34..86870bb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-SUBDIRS=doc src
+SUBDIRS=doc
 
 libXfontincludedir = $(includedir)/X11/fonts
 libXfontinclude_HEADERS = \
@@ -48,6 +48,118 @@ nodist_libXfontinclude_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xfont2.pc
 
+lib_LTLIBRARIES = libXfont2.la
+
+AM_CPPFLAGS = -I${top_srcdir}/include
+AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
+
+libXfont2_la_SOURCES =			\
+	src/stubs/atom.c		\
+	src/stubs/libxfontstubs.c	\
+	src/util/fontaccel.c		\
+	src/util/fontnames.c		\
+	src/util/fontutil.c		\
+	src/util/fontxlfd.c		\
+	src/util/format.c		\
+	src/util/miscutil.c		\
+	src/util/patcache.c		\
+	src/util/private.c		\
+	src/util/utilbitmap.c
+
+libXfont2_la_LDFLAGS = -version-number 2:0:0 -no-undefined
+
+libXfont2_la_LIBADD = $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS)
+
+if XFONT_FONTFILE
+libXfont2_la_SOURCES +=			\
+	src/fontfile/bitsource.c	\
+	src/fontfile/bufio.c		\
+	src/fontfile/decompress.c	\
+	src/fontfile/defaults.c		\
+	src/fontfile/dirfile.c		\
+	src/fontfile/fileio.c		\
+	src/fontfile/filewr.c		\
+	src/fontfile/fontdir.c		\
+	src/fontfile/fontencc.c		\
+	src/fontfile/fontfile.c		\
+	src/fontfile/fontscale.c	\
+	src/fontfile/gunzip.c		\
+	src/fontfile/register.c		\
+	src/fontfile/renderers.c	\
+	src/fontfile/catalogue.c
+
+if X_BZIP2_FONT_COMPRESSION
+libXfont2_la_SOURCES += src/fontfile/bunzip2.c
+endif
+endif
+
+if XFONT_FREETYPE
+AM_CFLAGS += $(FREETYPE_CFLAGS)
+
+libXfont2_la_LIBADD += $(FREETYPE_LIBS)
+libXfont2_la_SOURCES +=			\
+	src/FreeType/ft.h		\
+	src/FreeType/ftfuncs.h		\
+	src/FreeType/xttcap.h		\
+	src/FreeType/ftenc.c		\
+	src/FreeType/ftfuncs.c		\
+	src/FreeType/fttools.c		\
+	src/FreeType/xttcap.c
+endif
+
+if XFONT_BITMAP
+libXfont2_la_SOURCES +=			\
+	src/bitmap/bitmap.c		\
+	src/bitmap/bitmapfunc.c		\
+	src/bitmap/bitmaputil.c		\
+	src/bitmap/bitscale.c		\
+	src/bitmap/fontink.c
+
+if XFONT_BDFFORMAT
+libXfont2_la_SOURCES +=			\
+	src/bitmap/bdfread.c		\
+	src/bitmap/bdfutils.c
+endif
+
+if XFONT_PCF_OR_BUILTIN
+libXfont2_la_SOURCES += src/bitmap/pcfread.c
+endif
+
+if XFONT_PCFFORMAT
+libXfont2_la_SOURCES += src/bitmap/pcfwrite.c
+endif
+
+if XFONT_SNFFORMAT
+libXfont2_la_SOURCES +=			\
+	src/bitmap/snfread.c		\
+	src/bitmap/snfstr.h
+endif
+endif
+
+if XFONT_BUILTINS
+libXfont2_la_SOURCES +=			\
+	src/builtins/builtin.h		\
+	src/builtins/dir.c		\
+	src/builtins/file.c		\
+	src/builtins/fonts.c		\
+	src/builtins/fpe.c		\
+	src/builtins/render.c
+endif
+
+if XFONT_FC
+libXfont2_la_SOURCES +=			\
+	src/fc/fsconvert.c		\
+	src/fc/fserve.c			\
+	src/fc/fserve.h			\
+	src/fc/fservestr.h		\
+	src/fc/fsio.c			\
+	src/fc/fsio.h			\
+	src/fc/fslibos.h		\
+	src/fc/fstrans.c
+endif
+
+EXTRA_DIST = src/builtins/buildfont
+
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
 .PHONY: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index 0eb4c55..f331b93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AC_CONFIG_HEADERS([config.h include/X11/fonts/fontconf.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 # Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
 
 # Set common system defines for POSIX extensions, such as _GNU_SOURCE
 # Must be called before any macros that run the compiler (like
@@ -245,13 +245,5 @@ AC_SUBST([OS_CFLAGS])
 
 AC_CONFIG_FILES([Makefile
 		doc/Makefile
-		src/Makefile
-		src/fontfile/Makefile
-		src/FreeType/Makefile
-		src/builtins/Makefile
-		src/bitmap/Makefile
-		src/fc/Makefile
-		src/util/Makefile
-		src/stubs/Makefile
 		xfont2.pc])
 AC_OUTPUT
diff --git a/src/FreeType/Makefile.am b/src/FreeType/Makefile.am
deleted file mode 100644
index ab60ffa..0000000
--- a/src/FreeType/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-AM_CPPFLAGS = 			\
-	-I${top_srcdir}/include
-
-AM_CFLAGS = $(FREETYPE_CFLAGS) $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
-
-noinst_LTLIBRARIES = libft.la
-
-libft_la_SOURCES = 		\
-	ft.h			\
-	ftfuncs.h		\
-	xttcap.h		\
-	ftenc.c			\
-	ftfuncs.c		\
-	fttools.c		\
-	xttcap.c
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 03c704a..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,68 +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 = libXfont2.la
-
-AM_CFLAGS = $(OS_CFLAGS) $(CWARNFLAGS)
-
-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)
-
-libXfont2_la_LIBADD = \
-	$(FONTFILE_LIB) $(FREETYPE_LIB) $(BITMAP_LIB) \
-	$(BUILTINS_LIB) $(FC_LIB) $(UTIL_LIB) $(STUBS_LIB) \
-	$(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS)
-
-libXfont2_la_SOURCES = dummy.c
-
-libXfont2_la_LDFLAGS = -version-number 2:0:0 -no-undefined
diff --git a/src/bitmap/Makefile.am b/src/bitmap/Makefile.am
deleted file mode 100644
index 0f2d10a..0000000
--- a/src/bitmap/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-AM_CPPFLAGS =			\
-	-I${top_srcdir}/include
-
-AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
-
-noinst_LTLIBRARIES = libbitmap.la
-
-libbitmap_la_SOURCES = 		\
-	bitmap.c		\
-	bitmapfunc.c		\
-	bitmaputil.c		\
-	bitscale.c		\
-	fontink.c
-
-if XFONT_BDFFORMAT
-libbitmap_la_SOURCES += bdfread.c bdfutils.c
-endif
-
-if XFONT_PCF_OR_BUILTIN
-libbitmap_la_SOURCES += pcfread.c
-endif
-
-if XFONT_PCFFORMAT
-libbitmap_la_SOURCES += pcfwrite.c
-endif
-
-if XFONT_SNFFORMAT
-libbitmap_la_SOURCES += snfread.c snfstr.h
-endif
diff --git a/src/builtins/Makefile.am b/src/builtins/Makefile.am
deleted file mode 100644
index 6b96410..0000000
--- a/src/builtins/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-AM_CPPFLAGS =			\
-	-I${top_srcdir}/include \
-	-I${top_srcdir}/src/bitmap
-
-AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
-
-noinst_LTLIBRARIES = libbuiltins.la
-
-libbuiltins_la_SOURCES = 	\
-	builtin.h		\
-	dir.c			\
-	file.c			\
-	fonts.c			\
-	fpe.c			\
-	render.c
-
-EXTRA_DIST = buildfont
diff --git a/src/dummy.c b/src/dummy.c
deleted file mode 100644
index e69de29..0000000
--- a/src/dummy.c
+++ /dev/null
diff --git a/src/fc/Makefile.am b/src/fc/Makefile.am
deleted file mode 100644
index c180cae..0000000
--- a/src/fc/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-AM_CPPFLAGS = 			\
-	-I${top_srcdir}/include
-
-AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
-
-noinst_LTLIBRARIES = libfc.la
-
-libfc_la_SOURCES = 		\
-	fsconvert.c		\
-	fserve.c		\
-	fserve.h		\
-	fservestr.h		\
-	fsio.c			\
-	fsio.h			\
-	fslibos.h		\
-	fstrans.c
diff --git a/src/fontfile/Makefile.am b/src/fontfile/Makefile.am
deleted file mode 100644
index ab54cfd..0000000
--- a/src/fontfile/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-AM_CPPFLAGS = -I${top_srcdir}/include
-
-AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
-
-noinst_LTLIBRARIES = libfontfile.la
-
-libfontfile_la_LIBADD = 	\
-	$(Z_LIBS)
-
-libfontfile_la_SOURCES = 	\
-	bitsource.c		\
-	bufio.c			\
-	decompress.c		\
-	defaults.c		\
-	dirfile.c		\
-	fileio.c		\
-	filewr.c		\
-	fontdir.c		\
-	fontencc.c		\
-	fontfile.c		\
-	fontscale.c		\
-	gunzip.c		\
-	register.c		\
-	renderers.c		\
-	catalogue.c
-
-if X_BZIP2_FONT_COMPRESSION
-libfontfile_la_SOURCES += bunzip2.c
-endif
diff --git a/src/stubs/Makefile.am b/src/stubs/Makefile.am
deleted file mode 100644
index 65950cc..0000000
--- a/src/stubs/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AM_CPPFLAGS =			\
-	-I${top_srcdir}/include
-
-AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
-
-noinst_LTLIBRARIES = libstubs.la
-
-libstubs_la_SOURCES = 		\
-	atom.c			\
-	libxfontstubs.c
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
deleted file mode 100644
index d802b59..0000000
--- a/src/util/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-AM_CPPFLAGS =			\
-	-I${top_srcdir}/include \
-	-I$(top_srcdir)/src/stubs
-
-AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
-
-noinst_LTLIBRARIES = libutil.la
-
-libutil_la_SOURCES = 		\
-	fontaccel.c		\
-	fontnames.c		\
-	fontutil.c		\
-	fontxlfd.c		\
-	format.c		\
-	miscutil.c		\
-	patcache.c		\
-	private.c		\
-	utilbitmap.c