diff options
author | airlied <airlied@optimus.localdomain> | 2006-12-01 11:10:19 +1100 |
---|---|---|
committer | airlied <airlied@optimus.localdomain> | 2006-12-01 11:10:19 +1100 |
commit | 7c639791bea07340182de5e43db9526f8baee65a (patch) | |
tree | 2220f5bf5e439416d50849e5902f0f9eee68821f | |
parent | 0755ba068675d40add878b985eb986b532cce35f (diff) |
fixup configure.ac problems with DRI_SOURCES and LBX_SOURCES
-rw-r--r-- | hw/kdrive/ati/Makefile.am | 3 | ||||
-rw-r--r-- | hw/xfree86/os-support/Makefile.am | 2 | ||||
-rw-r--r-- | hw/xfree86/os-support/bsd/Makefile.am | 1 | ||||
-rw-r--r-- | os/Makefile.am | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/hw/kdrive/ati/Makefile.am b/hw/kdrive/ati/Makefile.am index 3732d7d72..4d65ce021 100644 --- a/hw/kdrive/ati/Makefile.am +++ b/hw/kdrive/ati/Makefile.am @@ -45,8 +45,7 @@ libati_a_SOURCES = \ ati_reg.h \ r128_composite.c \ ati_video.c \ - radeon_composite.c \ - $(DRI_SOURCES) + radeon_composite.c Xati_SOURCES = \ ati_stub.c diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am index 9c096c4ae..6cd9bb190 100644 --- a/hw/xfree86/os-support/Makefile.am +++ b/hw/xfree86/os-support/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS) +SUBDIRS = bus @XORG_OS_SUBDIR@ misc DIST_SUBDIRS = bsd bus misc linux lynxos solaris sysv sco usl hurd sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h \ diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am index 20885e866..543da2bab 100644 --- a/hw/xfree86/os-support/bsd/Makefile.am +++ b/hw/xfree86/os-support/bsd/Makefile.am @@ -72,7 +72,6 @@ libbsd_la_SOURCES = \ $(AGP_SOURCES) \ $(APM_SOURCES) \ $(AXP_SOURCES) \ - $(DRI_SOURCES) \ $(KMOD_SOURCES) \ $(RES_SOURCES) diff --git a/os/Makefile.am b/os/Makefile.am index 71e24c086..df08bc1bf 100644 --- a/os/Makefile.am +++ b/os/Makefile.am @@ -49,4 +49,4 @@ libcwrapper_la_CFLAGS = \ $(AM_CFLAGS) EXTRA_DIST = $(K5AUTH_SOURCES) $(SECURERPC_SOURCES) $(INTERNALMALLOC_SOURCES) \ - $(XCSECURITY_SOURCES) $(XDMCP_SOURCES) $(LBX_SOURCES) $(STRLCAT_SOURCES) + $(XCSECURITY_SOURCES) $(XDMCP_SOURCES) $(STRLCAT_SOURCES) |