diff options
| -rw-r--r-- | .cvsignore | 4 | ||||
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | src/.cvsignore | 2 | ||||
| -rw-r--r-- | src/FreeType/.cvsignore | 4 | ||||
| -rw-r--r-- | src/FreeType/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Speedo/.cvsignore | 4 | ||||
| -rw-r--r-- | src/Type1/.cvsignore | 4 | ||||
| -rw-r--r-- | src/bitmap/.cvsignore | 4 | ||||
| -rw-r--r-- | src/builtins/.cvsignore | 4 | ||||
| -rw-r--r-- | src/fc/.cvsignore | 4 | ||||
| -rw-r--r-- | src/fc/fstrans.c | 3 | ||||
| -rw-r--r-- | src/fontcache/.cvsignore | 4 | ||||
| -rw-r--r-- | src/fontcache/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fontfile/.cvsignore | 4 | ||||
| -rw-r--r-- | src/stubs/.cvsignore | 4 | ||||
| -rw-r--r-- | src/util/.cvsignore | 4 |
16 files changed, 47 insertions, 25 deletions
@@ -1,5 +1,3 @@ -Makefile -Makefile.in aclocal.m4 autom4te.cache compile @@ -14,6 +12,8 @@ depcomp install-sh libtool ltmain.sh +Makefile +Makefile.in missing mkinstalldirs stamp-h1 @@ -1,3 +1,22 @@ +2005-07-08 Keith Packard <keithp@keithp.com> + + * .cvsignore: + * src/.cvsignore: + * src/FreeType/.cvsignore: + * src/FreeType/Makefile.am: + * src/Speedo/.cvsignore: + * src/Type1/.cvsignore: + * src/bitmap/.cvsignore: + * src/builtins/.cvsignore: + * src/fc/.cvsignore: + * src/fontcache/.cvsignore: + * src/fontcache/Makefile.am: + * src/fontfile/.cvsignore: + * src/stubs/.cvsignore: + * src/util/.cvsignore: + Add .cvsignore files + Switch _la_CFLAGS for AM_CFLAGS to clean up directory + 2005-07-05 Alexander Gottwald <ago at freedesktop dot org> * configure.ac: diff --git a/src/.cvsignore b/src/.cvsignore index 7d496c4..0ca40df 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -1,4 +1,4 @@ +*.la .libs Makefile Makefile.in -*.la diff --git a/src/FreeType/.cvsignore b/src/FreeType/.cvsignore index 09980ae..5200253 100644 --- a/src/FreeType/.cvsignore +++ b/src/FreeType/.cvsignore @@ -1,6 +1,6 @@ .deps +*.la .libs +*.lo Makefile Makefile.in -*.lo -*.la diff --git a/src/FreeType/Makefile.am b/src/FreeType/Makefile.am index a37b640..e199c2f 100644 --- a/src/FreeType/Makefile.am +++ b/src/FreeType/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = \ noinst_LTLIBRARIES = libft.la -libft_la_CFLAGS=$(FREETYPE_CFLAGS) +AM_CFLAGS=$(FREETYPE_CFLAGS) libft_la_SOURCES = \ ft.h \ diff --git a/src/Speedo/.cvsignore b/src/Speedo/.cvsignore index 09980ae..5200253 100644 --- a/src/Speedo/.cvsignore +++ b/src/Speedo/.cvsignore @@ -1,6 +1,6 @@ .deps +*.la .libs +*.lo Makefile Makefile.in -*.lo -*.la diff --git a/src/Type1/.cvsignore b/src/Type1/.cvsignore index 09980ae..5200253 100644 --- a/src/Type1/.cvsignore +++ b/src/Type1/.cvsignore @@ -1,6 +1,6 @@ .deps +*.la .libs +*.lo Makefile Makefile.in -*.lo -*.la diff --git a/src/bitmap/.cvsignore b/src/bitmap/.cvsignore index 09980ae..5200253 100644 --- a/src/bitmap/.cvsignore +++ b/src/bitmap/.cvsignore @@ -1,6 +1,6 @@ .deps +*.la .libs +*.lo Makefile Makefile.in -*.lo -*.la diff --git a/src/builtins/.cvsignore b/src/builtins/.cvsignore index 09980ae..5200253 100644 --- a/src/builtins/.cvsignore +++ b/src/builtins/.cvsignore @@ -1,6 +1,6 @@ .deps +*.la .libs +*.lo Makefile Makefile.in -*.lo -*.la diff --git a/src/fc/.cvsignore b/src/fc/.cvsignore index 09980ae..5200253 100644 --- a/src/fc/.cvsignore +++ b/src/fc/.cvsignore @@ -1,6 +1,6 @@ .deps +*.la .libs +*.lo Makefile Makefile.in -*.lo -*.la diff --git a/src/fc/fstrans.c b/src/fc/fstrans.c index 73a540e..9f43d8f 100644 --- a/src/fc/fstrans.c +++ b/src/fc/fstrans.c @@ -22,6 +22,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #define FONT_t #define TRANS_CLIENT #include <X11/Xtrans/transport.c> diff --git a/src/fontcache/.cvsignore b/src/fontcache/.cvsignore index 09980ae..5200253 100644 --- a/src/fontcache/.cvsignore +++ b/src/fontcache/.cvsignore @@ -1,6 +1,6 @@ .deps +*.la .libs +*.lo Makefile Makefile.in -*.lo -*.la diff --git a/src/fontcache/Makefile.am b/src/fontcache/Makefile.am index 111ba7d..4066e1f 100644 --- a/src/fontcache/Makefile.am +++ b/src/fontcache/Makefile.am @@ -2,7 +2,7 @@ if XFONT_FONTCACHE INCLUDES = \ -I${top_srcdir}/include lib_LTLIBRARIES = libfontcache.la -libfontcache_la_CFLAGS = $(FONTCACHEPROTO_CFLAGS) +AM_CFLAGS = $(FONTCACHEPROTO_CFLAGS) libfontcache_la_SOURCES = fontcache.c fontcache.h fcqueue.h fontdir = $(includedir)/X11/fonts endif diff --git a/src/fontfile/.cvsignore b/src/fontfile/.cvsignore index 09980ae..5200253 100644 --- a/src/fontfile/.cvsignore +++ b/src/fontfile/.cvsignore @@ -1,6 +1,6 @@ .deps +*.la .libs +*.lo Makefile Makefile.in -*.lo -*.la diff --git a/src/stubs/.cvsignore b/src/stubs/.cvsignore index 09980ae..5200253 100644 --- a/src/stubs/.cvsignore +++ b/src/stubs/.cvsignore @@ -1,6 +1,6 @@ .deps +*.la .libs +*.lo Makefile Makefile.in -*.lo -*.la diff --git a/src/util/.cvsignore b/src/util/.cvsignore index 09980ae..5200253 100644 --- a/src/util/.cvsignore +++ b/src/util/.cvsignore @@ -1,6 +1,6 @@ .deps +*.la .libs +*.lo Makefile Makefile.in -*.lo -*.la |