summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-03-05 23:56:49 -0500
committerAdam Jackson <ajax@redhat.com>2008-03-05 23:57:15 -0500
commit34b69e3bc0e6462eb60029fbcb4f5479494007a2 (patch)
treeabe67475f018e1e5a63f688f00b8a15d56ff7a22
parentd4101140f4e569f18554cf0cbf43138d08bd1277 (diff)
Fix distcheck.
(cherry picked from commit 2a47accff8dccded4dfe031f9366c028ba927824)
-rw-r--r--GL/apple/Makefile.am8
-rw-r--r--hw/xfree86/x86emu/Makefile.am1
-rw-r--r--include/Makefile.am4
-rw-r--r--xkb/Makefile.am2
4 files changed, 8 insertions, 7 deletions
diff --git a/GL/apple/Makefile.am b/GL/apple/Makefile.am
index 33ad15714..c064c03f8 100644
--- a/GL/apple/Makefile.am
+++ b/GL/apple/Makefile.am
@@ -11,10 +11,10 @@ AM_CPPFLAGS = \
if HAVE_AGL_FRAMEWORK
noinst_LIBRARIES = libAGLcore.a
libAGLcore_a_SOURCES = aglGlx.c \
- $(top_srcdir)/hw/darwin/quartz/xpr/x-list.c \
- $(top_srcdir)/hw/darwin/quartz/xpr/x-list.h \
- $(top_srcdir)/hw/darwin/quartz/xpr/x-hash.c \
- $(top_srcdir)/hw/darwin/quartz/xpr/x-hash.h \
+ $(top_srcdir)/hw/xquartz/xpr/x-list.c \
+ $(top_srcdir)/hw/xquartz/xpr/x-list.h \
+ $(top_srcdir)/hw/xquartz/xpr/x-hash.c \
+ $(top_srcdir)/hw/xquartz/xpr/x-hash.h \
$(top_srcdir)/hw/dmx/glxProxy/compsize.c
endif
diff --git a/hw/xfree86/x86emu/Makefile.am b/hw/xfree86/x86emu/Makefile.am
index 9f9c87f4f..acd249c7f 100644
--- a/hw/xfree86/x86emu/Makefile.am
+++ b/hw/xfree86/x86emu/Makefile.am
@@ -21,6 +21,7 @@ EXTRA_DIST = validate.c \
x86emu/ops.h \
x86emu/prim_asm.h \
x86emu/prim_ops.h \
+ x86emu/prim_x86_gcc.h \
x86emu/regs.h \
x86emu/types.h \
x86emu/x86emui.h
diff --git a/include/Makefile.am b/include/Makefile.am
index 0654b5788..673a97685 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -50,10 +50,10 @@ sdk_HEADERS = \
validate.h \
window.h \
windowstr.h \
- xkbsrv.h \
xorg-server.h
endif
AM_CFLAGS = $(DIX_CFLAGS)
-EXTRA_DIST = $(sdk_HEADERS) do-not-use-config.h dix-config.h xorg-config.h
+EXTRA_DIST = $(sdk_HEADERS) do-not-use-config.h dix-config.h xorg-config.h \
+ xkb-config.h xkbfile.h xkbsrv.h xkbstr.h
diff --git a/xkb/Makefile.am b/xkb/Makefile.am
index e750d6098..5b594c130 100644
--- a/xkb/Makefile.am
+++ b/xkb/Makefile.am
@@ -47,7 +47,7 @@ libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XI_SRCS) $(XKBFILE_SRCS) \
$(X11_SRCS)
libxkbstubs_la_SOURCES = ddxVT.c ddxPrivate.c ddxKillSrv.c
-EXTRA_DIST = xkb.h xkbDflts.h
+EXTRA_DIST = xkbDflts.h xkbgeom.h xkb.h
xkbcompileddir = $(XKB_COMPILED_DIR)
dist_xkbcompiled_DATA = README.compiled