Bug #5871: Drop special build infrastructure left over from libcwrapper

    times. (George Fufutos)

ChangeLog

@@ -1,3 +1,13 @@
+2006-02-15  Eric Anholt  <[email protected]>
+
+	* XTrap/Makefile.am:
+	* Xext/Makefile.am:
+	* dbe/Makefile.am:
+	* hw/xfree86/dixmods/Makefile.am:
+	* record/Makefile.am:
+	Bug #5871: Drop special build infrastructure left over from libcwrapper
+	times. (George Fufutos)
+
 2006-02-16  Dave Airlie  <[email protected]>
 
 	* Xext/xres.c: (ProcXResQueryClientPixmapBytes):

XTrap/Makefile.am

@@ -1,11 +1,5 @@
-noinst_LTLIBRARIES = libxtrap.la libxtrapmodule.la
+noinst_LTLIBRARIES = libxtrap.la
 
 AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
 
 libxtrap_la_SOURCES = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c
-
-libxtrapmodule_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	@MODULE_DEFINES@ \
-	-I$(top_srcdir)/hw/xfree86/os-support
-libxtrapmodule_la_SOURCES = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c

Xext/Makefile.am

@@ -6,7 +6,7 @@
 #                    that Xorg loads
 noinst_LTLIBRARIES = libXext.la libXextbuiltin.la libXextmodule.la
 
-INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod -I$(top_srcdir)/hw/xfree86/os-support
+INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
 
 AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
 
@@ -130,7 +130,6 @@ libXext_la_SOURCES =		$(BUILTIN_SRCS) $(MODULE_SRCS)
 libXextbuiltin_la_SOURCES =	$(BUILTIN_SRCS)
 
 libXextmodule_la_SOURCES =	$(MODULE_SRCS)
-libXextmodule_la_CFLAGS = 	$(AM_CFLAGS) @MODULE_DEFINES@
 
 EXTRA_DIST = \
 	README.xtest1-ddx \

dbe/Makefile.am

@@ -1,9 +1,7 @@
-noinst_LTLIBRARIES = libdbe.la libdbemodule.la
+noinst_LTLIBRARIES = libdbe.la
 
 AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
 
-INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
-
 if XORG
 sdk_HEADERS = dbestruct.h
 endif
@@ -13,10 +11,3 @@ libdbe_la_SOURCES = \
         midbe.c \
         midbe.h \
         midbestr.h
-
-libdbemodule_la_CFLAGS = $(AM_CFLAGS) @MODULE_DEFINES@
-libdbemodule_la_SOURCES = \
-        dbe.c \
-        midbe.c \
-        midbe.h \
-        midbestr.h

hw/xfree86/dixmods/Makefile.am

@@ -64,7 +64,7 @@ libcfb32_la_LIBADD = $(top_builddir)/cfb32/libcfb32.la
 libcfb32_la_SOURCES = cfb32module.c
 
 libdbe_la_LDFLAGS = -avoid-version
-libdbe_la_LIBADD = $(top_builddir)/dbe/libdbemodule.la
+libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la
 libdbe_la_SOURCES = dbemodule.c
 
 libfb_la_LDFLAGS = -avoid-version
@@ -80,7 +80,7 @@ libmfb_la_LIBADD = $(top_builddir)/mfb/libmfb.la
 libmfb_la_SOURCES = mfbmodule.c
 
 librecord_la_LDFLAGS = -avoid-version
-librecord_la_LIBADD = $(top_builddir)/record/librecordmodule.la
+librecord_la_LIBADD = $(top_builddir)/record/librecord.la
 librecord_la_SOURCES = recordmod.c
 
 libshadow_la_LDFLAGS = -avoid-version
@@ -99,7 +99,7 @@ XKB_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
 libxorgxkb_la_SOURCES = $(XKB_SOURCES)
 
 libxtrap_la_LDFLAGS = -avoid-version
-libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrapmodule.la
+libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrap.la
 libxtrap_la_SOURCES = xf86XTrapModule.c
 
 $(XKB_SOURCES):

record/Makefile.am

@@ -1,12 +1,7 @@
-noinst_LTLIBRARIES = librecord.la librecordmodule.la
+noinst_LTLIBRARIES = librecord.la
 
 AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
 
-INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
-
 librecord_la_SOURCES = record.c set.c
 
-librecordmodule_la_CFLAGS = $(AM_CFLAGS) @MODULE_DEFINES@
-librecordmodule_la_SOURCES = record.c set.c
-
 EXTRA_DIST = set.h