summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hw/xfree86/dixmods/Makefile.am12
-rw-r--r--include/Makefile.am2
2 files changed, 11 insertions, 3 deletions
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index d346fdd7f..bea219e70 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES = $(XORG_INCS) -I$(top_srcdir)/afb -I$(top_srcdir)/mfb \
libbitmap_la_SOURCES = bitmapmod.c
libbitmap_la_LDFLAGS = -lXfont
+
libfb_la_SOURCES = fbmodule.c
libdixmods_la_SOURCES = \
@@ -19,8 +20,17 @@ libdixmods_la_SOURCES = \
cfb24module.c \
cfb32module.c \
mfbmodule.c \
- miinitext.c \
laymodule.c \
shmodule.c \
+ xkbKillSrv.c \
+ xkbPrivate.c \
+ xkbVT.c \
+ $(top_srcdir)/mi/miinitext.c \
$(top_srcdir)/Xext/xf86misc.c \
$(top_srcdir)/Xext/xf86vmode.c
+
+xkb%.c: $(srcdir)/ddx$*.c
+ echo "#define XF86DDXACTIONS" > $@
+ echo "#include \"$(top_srcdir)/xkb/ddx$*.c\"" >> $@
+
+DISTCLEANFILES = xkbKillSrv.c xkbPrivate.c xkbVT.c
diff --git a/include/Makefile.am b/include/Makefile.am
index 7167d0481..5890c964e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -23,10 +23,8 @@ sdk_HEADERS = \
globals.h \
input.h \
inputstr.h \
- misc.h \
miscstruct.h \
opaque.h \
- os.h \
pixmap.h \
pixmapstr.h \
property.h \