Attachment #101924 for bug #197190

View | Details | Raw Unified | Return to bug 197190
Collapse All | Expand All

Lines 13-20 COMMON_SOURCES = \ Link Here

(-)hw/xfree86/int10.orig/Makefile.am (-3 / +8 lines)
13	xf86int10.c \	13	xf86int10.c \
14	xf86int10module.c	14	xf86int10module.c
15		15
		16	if I386_VIDEO
		17	I386_VIDEO_CFLAGS = -D_PC
		18	endif
		19
16	if INT10_VM86	20	if INT10_VM86
17	AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)	21	AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
18	INCLUDES = $(XORG_INCS)	22	INCLUDES = $(XORG_INCS)
19	libint10_la_SOURCES = \	23	libint10_la_SOURCES = \
20	$(COMMON_SOURCES) \	24	$(COMMON_SOURCES) \
Lines 23-29 libint10_la_SOURCES = \ Link Here
23	endif	27	endif
24		28
25	if INT10_X86EMU	29	if INT10_X86EMU
26	AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS) $(EXTRA_CFLAGS)	30	AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_X86EMU -DNO_SYS_HEADERS \
		31	$(XORG_CFLAGS) $(EXTRA_CFLAGS)
27	INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu	32	INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
28	libint10_la_SOURCES = \	33	libint10_la_SOURCES = \
29	$(COMMON_SOURCES) \	34	$(COMMON_SOURCES) \
Lines 33-39 libint10_la_SOURCES = \ Link Here
33	endif	38	endif
34		39
35	if INT10_STUB	40	if INT10_STUB
36	AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)	41	AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
37	libint10_la_SOURCES = stub.c xf86int10module.c	42	libint10_la_SOURCES = stub.c xf86int10module.c
38	endif	43	endif
39		44

Lines 555-563 COMMON_SOURCES = \ Link Here

(-)hw/xfree86/int10.orig/Makefile.in (-3 / +6 lines)
555	xf86int10.c \	561	xf86int10.c \
556	xf86int10module.c	562	xf86int10module.c
557		563
558	@INT10_STUB_TRUE@AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)	564	@I386_VIDEO_TRUE@I386_VIDEO_CFLAGS = -D_PC
559	@INT10_VM86_TRUE@AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)	565	@INT10_STUB_TRUE@AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
560	@INT10_X86EMU_TRUE@AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS) $(EXTRA_CFLAGS)	566	@INT10_VM86_TRUE@AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
		567	@INT10_X86EMU_TRUE@AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_X86EMU -DNO_SYS_HEADERS \
		568	@INT10_X86EMU_TRUE@ $(XORG_CFLAGS) $(EXTRA_CFLAGS)
		569
561	@INT10_VM86_TRUE@INCLUDES = $(XORG_INCS)	570	@INT10_VM86_TRUE@INCLUDES = $(XORG_INCS)
562	@INT10_X86EMU_TRUE@INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu	571	@INT10_X86EMU_TRUE@INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
563	@INT10_STUB_TRUE@libint10_la_SOURCES = stub.c xf86int10module.c	572	@INT10_STUB_TRUE@libint10_la_SOURCES = stub.c xf86int10module.c

Return to bug 197190