diff options
| author | Keith Packard <keithp@guitar.keithp.com> | 2006-09-18 12:11:18 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@guitar.keithp.com> | 2006-09-18 12:11:18 -0700 |
| commit | 2be1ac15aee592782d7693b8de2c3815478a094e (patch) | |
| tree | 97520839ef054c6a4a0618ce46ee01b1a0b456e1 /hw/xfree86/int10 | |
| parent | bf07893947cfca945598e194ed416fda6162b11c (diff) | |
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.
Diffstat (limited to 'hw/xfree86/int10')
| -rw-r--r-- | hw/xfree86/int10/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am index c059070ec..868954fd4 100644 --- a/hw/xfree86/int10/Makefile.am +++ b/hw/xfree86/int10/Makefile.am @@ -14,7 +14,7 @@ COMMON_SOURCES = \ xf86int10module.c 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) libint10_la_SOURCES = \ $(COMMON_SOURCES) \ @@ -23,7 +23,7 @@ libint10_la_SOURCES = \ endif 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 libint10_la_SOURCES = \ $(COMMON_SOURCES) \ @@ -33,7 +33,7 @@ libint10_la_SOURCES = \ endif 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 endif |