From a309d8f77319e88df9efa0fd2b2cdf0bc0ad7f0f Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 15 Aug 2012 12:35:21 -0400 Subject: [PATCH] Always install vbe and int10 sdk headers Signed-off-by: Adam Jackson --- hw/xfree86/Makefile.am | 12 ++---------- hw/xfree86/int10/Makefile.am | 8 ++++++-- hw/xfree86/vbe/Makefile.am | 2 ++ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index c3899b5..f190b40 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -17,17 +17,9 @@ if VGAHW VGAHW_SUBDIR = vgahw endif -if VBE -VBE_SUBDIR = vbe -endif - -if INT10MODULE -INT10_SUBDIR = int10 -endif - -SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \ +SUBDIRS = common ddc x86emu int10 os-support parser \ ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \ - $(DRI2_SUBDIR) . $(VBE_SUBDIR) i2c dixmods \ + $(DRI2_SUBDIR) . vbe i2c dixmods \ fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \ diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am index f5ece69..9afad2f 100644 --- a/hw/xfree86/int10/Makefile.am +++ b/hw/xfree86/int10/Makefile.am @@ -1,7 +1,9 @@ -module_LTLIBRARIES = libint10.la - sdk_HEADERS = xf86int10.h +if INT10MODULE + +module_LTLIBRARIES = libint10.la + EXTRA_CFLAGS = libint10_la_LDFLAGS = -avoid-version @@ -43,4 +45,6 @@ INCLUDES = $(XORG_INCS) libint10_la_SOURCES = stub.c xf86int10module.c endif +endif + EXTRA_DIST = xf86x86emu.h INT10.HOWTO diff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am index 0b24faf..f0a9831 100644 --- a/hw/xfree86/vbe/Makefile.am +++ b/hw/xfree86/vbe/Makefile.am @@ -1,9 +1,11 @@ +if VBE module_LTLIBRARIES = libvbe.la libvbe_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) libvbe_la_SOURCES = vbe.c vbeModes.c vbe_module.c if NO_UNDEFINED libvbe_la_LIBADD = ../int10/libint10.la endif +endif sdk_HEADERS = vbe.h vbeModes.h -- 1.7.7.6