frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove smashing of CFLAGS from server build. 

CFLAGS is a user variable, extracted from the environment at configure time
and settable by the user at build time. We must not override this variable.
This commit is contained in:
Keith Packard 2006-09-18 12:11:18 -07:00
parent bf07893947
commit 2be1ac15ae
24 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -1605,13 +1605,11 @@ AM_CONDITIONAL(BUILD_KBD_MODE, [test x$BUILD_KBD_MODE = xyes])
AM_CONDITIONAL(BSD_KBD_MODE, [test x$KBD_MODE_TYPE = xbsd]) AM_CONDITIONAL(BSD_KBD_MODE, [test x$KBD_MODE_TYPE = xbsd])
AM_CONDITIONAL(SUN_KBD_MODE, [test x$KBD_MODE_TYPE = xsun]) AM_CONDITIONAL(SUN_KBD_MODE, [test x$KBD_MODE_TYPE = xsun])
CFLAGS="$XSERVER_CFLAGS $CFLAGS"
AC_SUBST([CFLAGS])
BUILD_DATE="$(date +'%Y%m%d')" BUILD_DATE="$(date +'%Y%m%d')"
AC_SUBST([BUILD_DATE]) AC_SUBST([BUILD_DATE])
DIX_CFLAGS="-DHAVE_DIX_CONFIG_H" DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"
AC_SUBST([DIX_CFLAGS]) AC_SUBST([DIX_CFLAGS])
AC_SUBST([libdir exec_prefix prefix]) AC_SUBST([libdir exec_prefix prefix])

2
hw/xfree86/common/Makefile.am
View File

@ -103,4 +103,4 @@ if LNXACPI
XORG_CFLAGS += -DHAVE_ACPI XORG_CFLAGS += -DHAVE_ACPI
endif endif
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

2
hw/xfree86/ddc/Makefile.am
View File

@ -8,6 +8,6 @@ libddc_la_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \
INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
EXTRA_DIST = ddcPriv.h DDC.HOWTO EXTRA_DIST = ddcPriv.h DDC.HOWTO

2
hw/xfree86/dixmods/extmod/Makefile.am
View File

@ -11,7 +11,7 @@ if XV
XV_SRCS = xvmod.c xvmodproc.h XV_SRCS = xvmod.c xvmodproc.h
endif endif
AM_CFLAGS = @XORG_CFLAGS@ AM_CFLAGS = @DIX_CFLAGS@ @XORG_CFLAGS@
INCLUDES = @XORG_INCS@ \ INCLUDES = @XORG_INCS@ \
-I$(top_srcdir)/afb \ -I$(top_srcdir)/afb \
-I$(top_srcdir)/mfb \ -I$(top_srcdir)/mfb \

2
hw/xfree86/dri/Makefile.am
View File

@ -10,7 +10,7 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
\ \
\ \
\ \
@DRIPROTO_CFLAGS@ \ @DIX_CFLAGS@ @DRIPROTO_CFLAGS@ \
@LIBDRM_CFLAGS@ \ @LIBDRM_CFLAGS@ \
@GL_CFLAGS@ @GL_CFLAGS@
libdri_la_LDFLAGS = -module -avoid-version libdri_la_LDFLAGS = -module -avoid-version

2
hw/xfree86/dummylib/Makefile.am
View File

@ -6,7 +6,7 @@ noinst_LIBRARIES = libdummy-nonserver.a
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
if NEED_STRLCAT if NEED_STRLCAT
STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c

2
hw/xfree86/exa/Makefile.am
View File

@ -7,7 +7,7 @@ INCLUDES = \
-I$(srcdir)/../../../exa \ -I$(srcdir)/../../../exa \
-I$(srcdir)/../../../miext/cw -I$(srcdir)/../../../miext/cw
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
libexa_la_SOURCES = \ libexa_la_SOURCES = \
examodule.c examodule.c

2
hw/xfree86/fbdevhw/Makefile.am
View File

@ -11,7 +11,7 @@ endif
INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
sdk_HEADERS = fbdevhw.h sdk_HEADERS = fbdevhw.h

2
hw/xfree86/i2c/Makefile.am
View File

@ -15,7 +15,7 @@ libi2c_la_SOURCES = xf86i2c.c xf86i2cmodule.c
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h uda1380.h i2c_def.h sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h uda1380.h i2c_def.h

6
hw/xfree86/int10/Makefile.am
View File

@ -14,7 +14,7 @@ COMMON_SOURCES = \
xf86int10module.c xf86int10module.c
if INT10_VM86 if INT10_VM86
AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS) AM_CFLAGS = -D_PC -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
libint10_la_SOURCES = \ libint10_la_SOURCES = \
$(COMMON_SOURCES) \ $(COMMON_SOURCES) \
@ -23,7 +23,7 @@ libint10_la_SOURCES = \
endif endif
if INT10_X86EMU if INT10_X86EMU
AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS) $(EXTRA_CFLAGS) AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
libint10_la_SOURCES = \ libint10_la_SOURCES = \
$(COMMON_SOURCES) \ $(COMMON_SOURCES) \
@ -33,7 +33,7 @@ libint10_la_SOURCES = \
endif endif
if INT10_STUB if INT10_STUB
AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS) AM_CFLAGS = -D_PC -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
libint10_la_SOURCES = stub.c xf86int10module.c libint10_la_SOURCES = stub.c xf86int10module.c
endif endif

2
hw/xfree86/loader/Makefile.am
View File

@ -5,7 +5,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../dixmods/extmod \
-I$(srcdir)/../ddc -I$(srcdir)/../i2c -I$(srcdir)/../ddc -I$(srcdir)/../i2c
#AM_LDFLAGS = -r #AM_LDFLAGS = -r
AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) AM_CFLAGS = -DIN_LOADER $(DIX_CFLAGS) $(XORG_CFLAGS)
if XORG_LOADER_SPARC if XORG_LOADER_SPARC
SPARC_SOURCES = SparcMulDiv.S SPARC_SOURCES = SparcMulDiv.S

2
hw/xfree86/os-support/Makefile.am
View File

@ -19,6 +19,8 @@ libxorgos_la_LIBADD = @XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.la \
bus/libbus.la \ bus/libbus.la \
misc/libmisc.la misc/libmisc.la
AM_CFLAGS = $(DIX_CFLAGS)
xorgos.c: xorgos.c:
touch $@ touch $@

2
hw/xfree86/parser/Makefile.am
View File

@ -26,7 +26,7 @@ libxf86config_a_SOURCES = \
DRI.c \ DRI.c \
Extensions.c Extensions.c
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
EXTRA_DIST = \ EXTRA_DIST = \
Configint.h \ Configint.h \

2
hw/xfree86/rac/Makefile.am
View File

@ -5,4 +5,4 @@ sdk_HEADERS = xf86RAC.h
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

2
hw/xfree86/ramdac/Makefile.am
View File

@ -13,7 +13,7 @@ EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h \
CURSOR.NOTES CURSOR.NOTES
AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \ AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \
$(XORG_CFLAGS) $(DIX_CFLAGS) $(XORG_CFLAGS)
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
xf86BitOrder.c: xf86BitOrder.c:

2
hw/xfree86/scanpci/Makefile.am
View File

@ -8,7 +8,7 @@ libscanpci_la_SOURCES = xf86ScanPci.c
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
BUILT_SOURCES = xf86PciIds.h BUILT_SOURCES = xf86PciIds.h

2
hw/xfree86/shadowfb/Makefile.am
View File

@ -6,4 +6,4 @@ sdk_HEADERS = shadowfb.h
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

2
hw/xfree86/vbe/Makefile.am
View File

@ -4,7 +4,7 @@ libvbe_la_SOURCES = vbe.c vbeModes.c vbe_module.c
sdk_HEADERS = vbe.h vbeModes.h sdk_HEADERS = vbe.h vbeModes.h
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \ INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
-I$(srcdir)/../int10 -I$(srcdir)/../int10

2
hw/xfree86/vgahw/Makefile.am
View File

@ -2,7 +2,7 @@ module_LTLIBRARIES = libvgahw.la
libvgahw_la_LDFLAGS = -avoid-version libvgahw_la_LDFLAGS = -avoid-version
libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c
INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
sdk_HEADERS = vgaHW.h sdk_HEADERS = vgaHW.h

2
hw/xfree86/x86emu/Makefile.am
View File

@ -11,7 +11,7 @@ libx86emu_a_SOURCES = debug.c \
INCLUDES = INCLUDES =
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
EXTRA_DIST = validate.c \ EXTRA_DIST = validate.c \
x86emu/debug.h \ x86emu/debug.h \

2
hw/xfree86/xaa/Makefile.am
View File

@ -68,4 +68,4 @@ EXTRA_DIST = xaacexp.h xaawrap.h xaaLine.c xaaDashLine.c \
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

2
hw/xfree86/xf4bpp/Makefile.am
View File

@ -59,4 +59,4 @@ mfbseg.c:
INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

2
hw/xfree86/xf8_16bpp/Makefile.am
View File

@ -4,7 +4,7 @@ sdk_HEADERS = cfb8_16.h
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/fb INCLUDES = $(XORG_INCS) -I$(top_srcdir)/fb
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
libxf8_16bpp_la_LDFLAGS = -avoid-version libxf8_16bpp_la_LDFLAGS = -avoid-version

2
hw/xfree86/xf8_32bpp/Makefile.am
View File

@ -4,7 +4,7 @@ sdk_HEADERS = cfb8_32.h
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
libxf8_32bpp_la_LDFLAGS = -avoid-version libxf8_32bpp_la_LDFLAGS = -avoid-version