[PATCH 8/8] Remove traces of extmod/libdbe from comments and makefiles

[Tomas Carnecky]

Traces of extmod are still left in the sample xorg.conf files.

Signed-off-by: Tomas Carnecky <tom at dbservice.com>
---
 Xext/xace.h                    |    1 -
 hw/dmx/Makefile.am             |    1 -
 hw/xfree86/common/Makefile.am  |    2 +-
 hw/xfree86/common/xf86Config.c |    1 -
 hw/xfree86/doc/devel/Registry  |    1 -
 hw/xfree86/loader/sdksyms.sh   |    8 +-------
 hw/xfree86/modes/Makefile.am   |    3 +--
 7 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Xext/xace.h b/Xext/xace.h
index 6029d87..2799bf3 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -59,7 +59,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 extern _X_EXPORT CallbackListPtr XaceHooks[XACE_NUM_HOOKS];
 
 /* Entry point for hook functions.  Called by Xserver.
- * Required by libdbe and libextmod
  */
 extern _X_EXPORT int XaceHook(
     int /*hook*/,
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 0d06346..b4c9753 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -11,7 +11,6 @@ if GLX
 SUBDIRS += glxProxy
 GLX_LIBS = glxProxy/libglxproxy.a
 GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c dmx_glxvisuals.h
-GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
 GLX_DEFS = @GL_CFLAGS@
 endif
 
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 821a2b5..b81ff61 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -46,7 +46,7 @@ libcommon_la_LIBADD = $(top_builddir)/config/libconfig.la
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
 	   -I$(srcdir)/../loader -I$(srcdir)/../parser \
            -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
-	   -I$(srcdir)/../vgahw -I$(srcdir)/../dixmods/extmod \
+	   -I$(srcdir)/../vgahw \
 	   -I$(srcdir)/../modes -I$(srcdir)/../ramdac
 
 sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index f6ee024..0ca5666 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -110,7 +110,6 @@ extern DeviceAssocRec mouse_assoc;
 #endif
 
 static ModuleDefault ModuleDefaults[] = {
-    {.name = "extmod",   .toLoad = TRUE,    .load_opt=NULL},
 #ifdef GLXEXT
     {.name = "glx",      .toLoad = TRUE,    .load_opt=NULL},
 #endif
diff --git a/hw/xfree86/doc/devel/Registry b/hw/xfree86/doc/devel/Registry
index 1fec230..76d5ebb 100644
--- a/hw/xfree86/doc/devel/Registry
+++ b/hw/xfree86/doc/devel/Registry
@@ -33,7 +33,6 @@ drm
 dynapro
 elo2300
 elographics
-extmod
 fb
 fbdev
 fbdevhw
diff --git a/hw/xfree86/loader/sdksyms.sh b/hw/xfree86/loader/sdksyms.sh
index 13c5ae5..621017c 100755
--- a/hw/xfree86/loader/sdksyms.sh
+++ b/hw/xfree86/loader/sdksyms.sh
@@ -129,7 +129,7 @@ cat > sdksyms.c << EOF
 # include "xf86xvmc.h"
 # include "xf86xvpriv.h"
 #endif
-/* XF86VidMode code is in libextmod module */
+/* XF86VidMode code is in Xext/ */
 /*
 #if XF86VIDMODE
 # include "vidmodeproc.h"
@@ -182,12 +182,6 @@ cat > sdksyms.c << EOF
  */
 
 
-/* hw/xfree86/dixmods/extmod/Makefile.am -- module */
-/*
-#include "dgaproc.h"
- */
-
-
 /* hw/xfree86/parser/Makefile.am */
 #include "xf86Parser.h"
 #include "xf86Optrec.h"
diff --git a/hw/xfree86/modes/Makefile.am b/hw/xfree86/modes/Makefile.am
index 9236426..f2d9d31 100644
--- a/hw/xfree86/modes/Makefile.am
+++ b/hw/xfree86/modes/Makefile.am
@@ -23,8 +23,7 @@ libxf86modes_la_SOURCES = \
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
 	   -I$(srcdir)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \
 	   -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
-	   -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac \
-	   -I$(srcdir)/../dixmods/extmod
+	   -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac
 
 sdk_HEADERS = \
 	xf86Crtc.h \
-- 
1.7.2.1.g43c6fa