summaryrefslogtreecommitdiff
path: root/hw/xfree86/int10
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-11-29 16:39:33 +0000
committerKevin E Martin <kem@kem.org>2005-11-29 16:39:33 +0000
commitda5d66f2ff27b21fe5c39a4abb4f627edd707f1d (patch)
treead479b2ead1b745fc1eb056456c2126f8e18f947 /hw/xfree86/int10
parent51a721a6dbb42702347aad3115147e4922fc1a25 (diff)
Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
module builds to reflect this change.
Diffstat (limited to 'hw/xfree86/int10')
-rw-r--r--hw/xfree86/int10/Makefile.am8
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am
index 47b98b5b3..18174769e 100644
--- a/hw/xfree86/int10/Makefile.am
+++ b/hw/xfree86/int10/Makefile.am
@@ -2,10 +2,12 @@ module_LTLIBRARIES = libint10.la
sdk_HEADERS = xf86int10.h
+EXTRA_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
+
libint10_la_LDFLAGS = -avoid-version
if INT10_VM86
-AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS)
+AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
INCLUDES = $(XORG_INCS)
libint10_la_SOURCES = \
helper_exec.c \
@@ -18,14 +20,14 @@ libint10_la_SOURCES = \
endif
if INT10_X86EMU
-AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS)
+AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS) $(EXTRA_CFLAGS)
INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
libint10_la_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \
xf86int10.c xf86x86emu.c generic.c x86emu.c
endif
if INT10_STUB
-AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS)
+AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
libint10_la_SOURCES = stub.c xf86int10module.c
endif