diff options
| author | Julien Cristau <jcristau@debian.org> | 2008-11-04 19:24:29 +0100 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2008-11-04 19:26:45 +0100 |
| commit | f859a76b0f325b07952ad1c5c818318307c589b0 (patch) | |
| tree | 2cb836fef7fd18d65ef8177cc2ca694d893f890c /src | |
| parent | 6bf52de1fb84d61b227daf7a7077af9ea3ec27a3 (diff) | |
Don't clobber CFLAGS in configure
This lets the user set CFLAGS when running make.
Diffstat (limited to 'src')
| -rw-r--r-- | src/FreeType/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Speedo/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Type1/Makefile.am | 2 | ||||
| -rw-r--r-- | src/bitmap/Makefile.am | 2 | ||||
| -rw-r--r-- | src/builtins/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fc/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fontfile/Makefile.am | 2 | ||||
| -rw-r--r-- | src/stubs/Makefile.am | 2 | ||||
| -rw-r--r-- | src/util/Makefile.am | 2 |
10 files changed, 18 insertions, 2 deletions
diff --git a/src/FreeType/Makefile.am b/src/FreeType/Makefile.am index 8e67837..fa45da1 100644 --- a/src/FreeType/Makefile.am +++ b/src/FreeType/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = \ noinst_LTLIBRARIES = libft.la -AM_CFLAGS=$(FREETYPE_CFLAGS) +AM_CFLAGS = $(FREETYPE_CFLAGS) $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS) libft_la_SOURCES = \ ft.h \ diff --git a/src/Makefile.am b/src/Makefile.am index cf71328..3e0cbfa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -71,7 +71,7 @@ libXfont_la_LIBADD = \ $(FONTFILE_LIB) $(FREETYPE_LIB) $(BITMAP_LIB) \ $(BUILTINS_LIB) $(FC_LIB) $(UTIL_LIB) $(STUBS_LIB) \ $(TYPE1_LIB) $(SPEEDO_LIB) \ - $(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) + $(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS) libXfont_la_SOURCES = dummy.c diff --git a/src/Speedo/Makefile.am b/src/Speedo/Makefile.am index f282aef..99d972d 100644 --- a/src/Speedo/Makefile.am +++ b/src/Speedo/Makefile.am @@ -1,6 +1,8 @@ INCLUDES = \ -I${top_srcdir}/include +AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS) + noinst_LTLIBRARIES = libspeedo.la libspeedo_la_SOURCES = \ diff --git a/src/Type1/Makefile.am b/src/Type1/Makefile.am index 0a2a607..cf5eb7d 100644 --- a/src/Type1/Makefile.am +++ b/src/Type1/Makefile.am @@ -1,6 +1,8 @@ INCLUDES = \ -I${top_srcdir}/include +AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS) + noinst_LTLIBRARIES = libtype1.la libtype1_la_SOURCES = \ diff --git a/src/bitmap/Makefile.am b/src/bitmap/Makefile.am index e3ef040..b5b9674 100644 --- a/src/bitmap/Makefile.am +++ b/src/bitmap/Makefile.am @@ -1,6 +1,8 @@ INCLUDES = \ -I${top_srcdir}/include +AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS) + noinst_LTLIBRARIES = libbitmap.la libbitmap_la_SOURCES = \ diff --git a/src/builtins/Makefile.am b/src/builtins/Makefile.am index af6ed98..b203fda 100644 --- a/src/builtins/Makefile.am +++ b/src/builtins/Makefile.am @@ -2,6 +2,8 @@ INCLUDES = \ -I${top_srcdir}/include \ -I${top_srcdir}/src/bitmap +AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS) + noinst_LTLIBRARIES = libbuiltins.la libbuiltins_la_SOURCES = \ diff --git a/src/fc/Makefile.am b/src/fc/Makefile.am index 120fbeb..3bfd231 100644 --- a/src/fc/Makefile.am +++ b/src/fc/Makefile.am @@ -1,6 +1,8 @@ INCLUDES = \ -I${top_srcdir}/include +AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS) + noinst_LTLIBRARIES = libfc.la libfc_la_SOURCES = \ diff --git a/src/fontfile/Makefile.am b/src/fontfile/Makefile.am index 8418269..45d1dba 100644 --- a/src/fontfile/Makefile.am +++ b/src/fontfile/Makefile.am @@ -5,6 +5,8 @@ INCLUDES = \ -I${top_srcdir}/include \ $(FONTENCDEFS) +AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS) + noinst_LTLIBRARIES = libfontfile.la libfontfile_la_LIBADD = \ diff --git a/src/stubs/Makefile.am b/src/stubs/Makefile.am index acee880..963470f 100644 --- a/src/stubs/Makefile.am +++ b/src/stubs/Makefile.am @@ -1,6 +1,8 @@ INCLUDES = \ -I${top_srcdir}/include +AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS) + noinst_LTLIBRARIES = libstubs.la libstubs_la_SOURCES = \ diff --git a/src/util/Makefile.am b/src/util/Makefile.am index bec93ee..055fc9d 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -2,6 +2,8 @@ INCLUDES = \ -I${top_srcdir}/include \ -I$(top_srcdir)/src/stubs +AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS) + noinst_LTLIBRARIES = libutil.la libutil_la_SOURCES = \ |