diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | hw/xfree86/common/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/Makefile.am | 6 | ||||
| -rw-r--r-- | hw/xfree86/loader/Makefile.am | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 7af524059..b94dc7278 100644 --- a/configure.ac +++ b/configure.ac @@ -775,6 +775,7 @@ hw/xfree86/common/Makefile hw/xfree86/common/xf86Build.h hw/xfree86/ddc/Makefile hw/xfree86/dixmods/Makefile +hw/xfree86/dixmods/extmod/Makefile hw/xfree86/dri/Makefile hw/xfree86/dummylib/Makefile hw/xfree86/fbdevhw/Makefile diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am index b77f93479..0469a789b 100644 --- a/hw/xfree86/common/Makefile.am +++ b/hw/xfree86/common/Makefile.am @@ -57,7 +57,7 @@ libinit_a_SOURCES = xf86Build.h xf86Init.c INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \ -I$(srcdir)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \ -I$(srcdir)/../scanpci -I$(srcdir)/../vbe -I$(srcdir)/../int10 \ - -I$(srcdir)/../vgahw + -I$(srcdir)/../vgahw -I$(srcdir)/../dixmods/extmod sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \ xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \ diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index 1b7367076..daf463a9c 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -1,5 +1,7 @@ noinst_LTLIBRARIES = libdixmods.la +SUBDIRS = extmod + if GLX GLXMODS = libglx.la libGLcore.la endif @@ -71,9 +73,7 @@ libdixmods_la_SOURCES = \ xkbKillSrv.c \ xkbPrivate.c \ xkbVT.c \ - $(top_srcdir)/mi/miinitext.c \ - $(top_srcdir)/Xext/xf86misc.c \ - $(top_srcdir)/Xext/xf86vmode.c + $(top_srcdir)/mi/miinitext.c xkb%.c: echo "#define XF86DDXACTIONS" > $@ diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am index 832d46a0b..6701447d1 100644 --- a/hw/xfree86/loader/Makefile.am +++ b/hw/xfree86/loader/Makefile.am @@ -2,7 +2,8 @@ noinst_LIBRARIES = libloader.a INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \ -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \ -I$(srcdir)/../fbdevhw -I$(srcdir)/../scanpci -I$(srcdir)/../xaa \ - -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac -I$(srcdir)/../shadowfb + -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac -I$(srcdir)/../shadowfb \ + -I$(srcdir)/../dixmods/extmod #AM_LDFLAGS = -r AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) |