fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2025-12-24 16:00:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split CFLAGS into CPPFLAGS and CFLAGS

Browse source 
On some build systems, CPPFLAGS is set to "-I/some/prefix/include".  If older
X11 headers are in /some/prefix/include, they will be preferred over the
shipped headers.  This corrects that problem.
This commit is contained in:
Jeremy Huddleston 2009-10-01 22:20:38 -07:00
parent d54caf1c9c
commit 3bb020587c
10 changed files with 43 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/im/ximcp/Makefile.am
View file

@ -1,4 +1,4 @@
AM_CFLAGS= \
AM_CPPFLAGS= \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include \
@ -6,10 +6,12 @@ AM_CFLAGS= \
-I$(top_srcdir)/src/xcms \
-I$(top_srcdir)/src/xkb \
-I$(top_srcdir)/src/xlibi18n \
-D_BSD_SOURCE -DXIM_t -DTRANS_CLIENT
AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
-D_BSD_SOURCE -DXIM_t -DTRANS_CLIENT \
$(MALLOC_ZERO_CFLAGS)
if XLIB_LOADABLE_I18N

6
modules/lc/Utf8/Makefile.am
View file

@ -1,4 +1,4 @@
AM_CFLAGS= \
AM_CPPFLAGS= \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include \
@ -6,10 +6,12 @@ AM_CFLAGS= \
-I$(top_srcdir)/src/xcms \
-I$(top_srcdir)/src/xkb \
-I$(top_srcdir)/src/xlibi18n \
-D_BSD_SOURCE
AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
-D_BSD_SOURCE \
$(MALLOC_ZERO_CFLAGS)
if XLIB_LOADABLE_I18N

8
modules/lc/def/Makefile.am
View file

@ -1,4 +1,4 @@
AM_CFLAGS= \
AM_CPPFLAGS= \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include \
@ -6,10 +6,12 @@ AM_CFLAGS= \
-I$(top_srcdir)/src/xcms \
-I$(top_srcdir)/src/xkb \
-I$(top_srcdir)/src/xlibi18n \
-D_BSD_SOURCE
AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
-D_BSD_SOURCE
$(XDMCP_CFLAGS)
if XLIB_LOADABLE_I18N

8
modules/lc/gen/Makefile.am
View file

@ -1,4 +1,4 @@
AM_CFLAGS= \
AM_CPPFLAGS= \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include \
@ -6,10 +6,12 @@ AM_CFLAGS= \
-I$(top_srcdir)/src/xcms \
-I$(top_srcdir)/src/xkb \
-I$(top_srcdir)/src/xlibi18n \
-D_BSD_SOURCE
AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
-D_BSD_SOURCE
$(XDMCP_CFLAGS)
if XLIB_LOADABLE_I18N

8
modules/lc/xlocale/Makefile.am
View file

@ -1,4 +1,4 @@
AM_CFLAGS= \
AM_CPPFLAGS= \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include \
@ -6,10 +6,12 @@ AM_CFLAGS= \
-I$(top_srcdir)/src/xcms \
-I$(top_srcdir)/src/xkb \
-I$(top_srcdir)/src/xlibi18n \
-D_BSD_SOURCE
AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
-D_BSD_SOURCE
$(XDMCP_CFLAGS)
if XLIB_LOADABLE_I18N

6
modules/om/generic/Makefile.am
View file

@ -1,4 +1,4 @@
AM_CFLAGS= \
AM_CPPFLAGS= \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include \
@ -7,10 +7,12 @@ AM_CFLAGS= \
-I$(top_srcdir)/src/xkb \
-I$(top_srcdir)/src/xlibi18n \
-I$(top_srcdir)/src \
-D_BSD_SOURCE
AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
-D_BSD_SOURCE \
$(MALLOC_ZERO_CFLAGS)
if XLIB_LOADABLE_I18N

6
src/Makefile.am
View file

@ -8,7 +8,7 @@ lib_LTLIBRARIES=libX11.la
BUILT_SOURCES=ks_tables.h
CLEANFILES=ks_tables.h ks_tables_h
AM_CFLAGS= \
AM_CPPFLAGS= \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include \
@ -16,10 +16,12 @@ AM_CFLAGS= \
-I$(top_srcdir)/src/xcms \
-I$(top_srcdir)/src/xkb \
-I$(top_srcdir)/src/xlibi18n \
-D_BSD_SOURCE -DX11_t -DTRANS_CLIENT
AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
-D_BSD_SOURCE -DX11_t -DTRANS_CLIENT \
$(XMALLOC_ZERO_CFLAGS)
#

6
src/xcms/Makefile.am
View file

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libxcms.la
AM_CFLAGS= \
AM_CPPFLAGS= \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include \
@ -9,10 +9,12 @@ AM_CFLAGS= \
-I$(top_srcdir)/src/xkb \
-I$(top_srcdir)/src/xlibi18n \
-I$(top_srcdir)/src \
-D_BSD_SOURCE
AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
-D_BSD_SOURCE \
$(XMALLOC_ZERO_CFLAGS)
libxcms_la_SOURCES = \

6
src/xkb/Makefile.am
View file

@ -1,4 +1,4 @@
AM_CFLAGS= \
AM_CPPFLAGS= \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include \
@ -6,10 +6,12 @@ AM_CFLAGS= \
-I$(top_srcdir)/src/xcms \
-I$(top_srcdir)/src/xkb \
-I$(top_srcdir)/src/xlibi18n \
-D_BSD_SOURCE
AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
-D_BSD_SOURCE \
$(XMALLOC_ZERO_CFLAGS)
noinst_LTLIBRARIES = libxkb.la

6
src/xlibi18n/Makefile.am
View file

@ -1,4 +1,4 @@
AM_CFLAGS= \
AM_CPPFLAGS= \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include \
@ -7,10 +7,12 @@ AM_CFLAGS= \
-I$(top_srcdir)/src/xkb \
-I$(top_srcdir)/src/xlibi18n \
-I$(top_srcdir)/src \
-D_BSD_SOURCE
AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
-D_BSD_SOURCE \
$(XMALLOC_ZERO_CFLAGS)
noinst_LTLIBRARIES = libi18n.la