Fix distcheck for server

26 files changed, 171 insertions, 57 deletions

diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index e2e6bf8bb..fb514e50f 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
 # terribly gross hack.  i need a shower now.
 AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server
 
-libX_la_SOURCES = xf86glx.c \
+nodist_libX_la_SOURCES = xf86glx.c \
                   xf86glx_util.c \
                   xm_api.c \
 		  xm_buffer.c \
diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am
index 7bc75e808..506cad714 100644
--- a/GL/mesa/array_cache/Makefile.am
+++ b/GL/mesa/array_cache/Makefile.am
@@ -12,4 +12,4 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../tnl \
            -I$(srcdir)/..
 
-libac_la_SOURCES = ac_context.c ac_import.c
+nodist_libac_la_SOURCES = ac_context.c ac_import.c
diff --git a/GL/mesa/glapi/Makefile.am b/GL/mesa/glapi/Makefile.am
index 1ce85f55f..02f7e8951 100644
--- a/GL/mesa/glapi/Makefile.am
+++ b/GL/mesa/glapi/Makefile.am
@@ -12,4 +12,4 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../tnl \
            -I$(srcdir)/..
 
-libglapi_la_SOURCES = glapi.c glthread.c
+nodist_libglapi_la_SOURCES = glapi.c glthread.c
diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
index ce2a94717..a6b23a57e 100644
--- a/GL/mesa/main/Makefile.am
+++ b/GL/mesa/main/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../tnl \
            -I$(srcdir)/..
 
-libmain_la_SOURCES = accum.c \
+nodist_libmain_la_SOURCES = accum.c \
                     api_arrayelt.c \
                     api_loopback.c \
                     api_noop.c \
diff --git a/GL/mesa/math/Makefile.am b/GL/mesa/math/Makefile.am
index d0589cdf4..6661e944d 100644
--- a/GL/mesa/math/Makefile.am
+++ b/GL/mesa/math/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../tnl \
            -I$(srcdir)/..
 
-libmath_la_SOURCES = m_debug_clip.c \
+nodist_libmath_la_SOURCES = m_debug_clip.c \
                        m_debug_norm.c \
                        m_debug_xform.c \
                        m_eval.c \
diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am
index 06c98a564..886a08512 100644
--- a/GL/mesa/shader/Makefile.am
+++ b/GL/mesa/shader/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../tnl \
            -I$(srcdir)/..
 
-libshader_la_SOURCES = arbfragparse.c \
+nodist_libshader_la_SOURCES = arbfragparse.c \
                       arbprogparse.c \
                       arbprogram.c \
                       arbvertparse.c \
diff --git a/GL/mesa/shader/grammar/Makefile.am b/GL/mesa/shader/grammar/Makefile.am
index ce9e7d67c..25c84e5b9 100644
--- a/GL/mesa/shader/grammar/Makefile.am
+++ b/GL/mesa/shader/grammar/Makefile.am
@@ -12,4 +12,4 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../../tnl \
            -I$(srcdir)/../..
 
-libgrammar_la_SOURCES = grammar_mesa.c
+nodist_libgrammar_la_SOURCES = grammar_mesa.c
diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am
index 941adf8d4..19b6c249f 100644
--- a/GL/mesa/shader/slang/Makefile.am
+++ b/GL/mesa/shader/slang/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../../tnl \
            -I$(srcdir)/../..
 
-libslang_la_SOURCES = slang_assemble_assignment.c \
+nodist_libslang_la_SOURCES = slang_assemble_assignment.c \
 		      slang_assemble.c \
 		      slang_assemble_conditional.c \
 		      slang_assemble_constructor.c \
diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am
index e5075a34e..b18157432 100644
--- a/GL/mesa/swrast/Makefile.am
+++ b/GL/mesa/swrast/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../tnl \
            -I$(srcdir)/..
 
-libswrast_la_SOURCES = s_aaline.c \
+nodist_libswrast_la_SOURCES = s_aaline.c \
                       s_aatriangle.c \
                       s_accum.c \
                       s_alpha.c \
diff --git a/GL/mesa/swrast_setup/Makefile.am b/GL/mesa/swrast_setup/Makefile.am
index e674223c1..40e6edb17 100644
--- a/GL/mesa/swrast_setup/Makefile.am
+++ b/GL/mesa/swrast_setup/Makefile.am
@@ -12,4 +12,4 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../tnl \
            -I$(srcdir)/..
 
-libss_la_SOURCES = ss_context.c ss_triangle.c
+nodist_libss_la_SOURCES = ss_context.c ss_triangle.c
diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am
index acebb4625..02d2c4d5f 100644
--- a/GL/mesa/tnl/Makefile.am
+++ b/GL/mesa/tnl/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../tnl \
            -I$(srcdir)/..
 
-libtnl_la_SOURCES = t_array_api.c \
+nodist_libtnl_la_SOURCES = t_array_api.c \
                       t_array_import.c \
                       t_context.c \
                       t_pipeline.c \
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index dc07eb836..ac5f9246b 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -2,8 +2,6 @@ noinst_LTLIBRARIES = libXext.la
 
 sdk_HEADERS = xvdix.h xvmcext.h
 
-SUBDIRS = extmod
-
 if MITSHM
 MITSHM_SRCS = shm.c
 endif
@@ -32,14 +30,13 @@ if XEVIE
 XEVIE_SRCS = xevie.c EVIstruct.h
 endif
 
-INCLUDES = -I$(srcdir)/extmod -I$(top_builddir)/hw/xfree86/dixmods/extmod
+INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
 
 AM_CFLAGS = $(DIX_CFLAGS)
 
 EXTRA_DIST = \
 	appgroup.h \
-	xvdisp.h \
-	xvmodproc.h
+	xvdisp.h
 
 # dmx.c has a hard dependency on the dmx DDX
 libXext_la_SOURCES =		\
diff --git a/Xext/extmod/Makefile.am b/Xext/extmod/Makefile.am
deleted file mode 100644
index 4a11295a0..000000000
--- a/Xext/extmod/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-AM_CFLAGS = $(DIX_CFLAGS)
-
-EXTRA_DIST = modinit.h
diff --git a/configure.ac b/configure.ac
index 87fcd0850..ef0b936b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -815,7 +815,6 @@ randr/Makefile
 render/Makefile
 xkb/Makefile
 Xext/Makefile
-Xext/extmod/Makefile
 Xi/Makefile
 xfixes/Makefile
 hw/Makefile
diff --git a/hw/Makefile.am b/hw/Makefile.am
index e2681953c..863649b69 100644
--- a/hw/Makefile.am
+++ b/hw/Makefile.am
@@ -24,3 +24,5 @@ SUBDIRS =			\
 	$(XVFB_SUBDIRS)		\
 	$(XNEST_SUBDIRS)	\
 	$(DMX_SUBDIRS)
+
+DIST_SUBDIRS = dmx xfree86 vfb xnest xwin
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index f465b7a3d..7a3116902 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -1,3 +1,5 @@
+DIST_SUBDIRS = input config glxProxy
+
 SUBDIRS = input config
 bin_PROGRAMS = Xdmx
 
@@ -8,31 +10,54 @@ endif
 if GLX
 SUBDIRS += glxProxy
 GLX_LIBS = glxProxy/libglxproxy.a
-GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c
+GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c dmx_glxvisuals.h
 GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
 endif
 
-Xdmx_SOURCES = dmxinit.c \
-               dmxscrinit.c \
-               dmxshadow.c \
+Xdmx_SOURCES = dmx.c \
+               dmxcb.c \
+               dmxcb.h \
+               dmxclient.h \
+               dmxcmap.c \
+               dmxcmap.h \
+               dmx-config.h \
                dmxcursor.c \
-               dmxinput.c \
+               dmxcursor.h \
                dmxdpms.c \
+               dmxdpms.h \
+               dmxextension.c \
+               dmxextension.h \
+               dmxfont.c \
+               dmxfont.h \
                dmxgc.c \
+               dmxgc.h \
                dmxgcops.c \
-               dmxwindow.c \
-               dmxpixmap.c \
-               dmxfont.c \
-               dmxcmap.c \
-               dmxvisual.c \
+               dmxgcops.h \
+               dmx.h \
+               dmxinit.c \
+               dmxinit.h \
+               dmxinput.c \
+               dmxinput.h \
                dmxlog.c \
-               dmxcb.c \
+               dmxlog.h \
+               dmxpict.c \
+               dmxpict.h \
+               dmxpixmap.c \
+               dmxpixmap.h \
                dmxprop.c \
+               dmxprop.h \
+               dmxscrinit.c \
+               dmxscrinit.h \
+               dmxshadow.c \
+               dmxshadow.h \
                dmxstat.c \
+               dmxstat.h \
                dmxsync.c \
-               dmxextension.c \
-               dmxpict.c \
-               dmx.c \
+               dmxsync.h \
+               dmxvisual.c \
+               dmxvisual.h \
+               dmxwindow.c \
+               dmxwindow.h \
                $(top_srcdir)/fb/fbcmap.c \
                $(top_srcdir)/mi/miinitext.c \
                $(GLX_SRCS) 
diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am
index 2e8d756fd..c761c4838 100644
--- a/hw/dmx/config/Makefile.am
+++ b/hw/dmx/config/Makefile.am
@@ -1,6 +1,15 @@
 noinst_LIBRARIES = libdmxconfig.a
 
-LIBSRCS = parser.y scanner.l dmxparse.c dmxprint.c dmxcompat.c dmxconfig.c
+LIBSRCS = parser.y \
+          scanner.l \
+          dmxparse.c \
+          dmxparse.h \
+          dmxprint.c \
+          dmxprint.h \
+          dmxcompat.c \
+          dmxcompat.h \
+          dmxconfig.c \
+          dmxconfig.h
 
 parser.h: parser.c
 scanner.c: scanner.l parser.h
@@ -9,5 +18,5 @@ CLEANFILES = parser.c parser.h scanner.c
 
 libdmxconfig_a_SOURCES = $(LIBSRCS)
 
-AM_CFLAGS = -I.. -DHAVE_DMX_CONFIG_H @DMXMODULES_CFLAGS@
+AM_CFLAGS = -I$(top_srcdir)/hw/dmx -DHAVE_DMX_CONFIG_H @DMXMODULES_CFLAGS@
 AM_YFLAGS = -d
diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am
index 9b40f5377..14e0fbd9f 100644
--- a/hw/dmx/glxProxy/Makefile.am
+++ b/hw/dmx/glxProxy/Makefile.am
@@ -1,22 +1,38 @@
 noinst_LIBRARIES = libglxproxy.a
 
-libglxproxy_a_SOURCES = g_disptab.c \
+libglxproxy_a_SOURCES = compsize.c \
+                        g_disptab.c \
+                        g_disptab.h \
+                        global.c \
                         glxcmds.c \
+                        glxcmdsswap.c \
+                        glxcontext.h \
+                        glxdrawable.h \
+                        glxerror.h \
                         glxext.c \
+                        glxext.h \
+                        glxfbconfig.c \
+                        glxfbconfig.h \
+                        glxscreens.c \
+                        glxscreens.h \
+                        glxserver.h \
+                        glxsingle.c \
+                        glxsingle.h \
+                        glxswap.c \
+                        glxswap.h \
                         glxutil.c \
+                        glxutil.h \
+                        glxvendor.c \
+                        glxvendor.h \
+                        glxvisuals.c \
+                        glxvisuals.h \
                         g_renderswap.c \
                         render2swap.c \
                         renderpixswap.c \
-                        global.c \
-                        glxcmdsswap.c \
-                        compsize.c \
-                        glxscreens.c \
-                        glxvisuals.c \
-                        glxsingle.c \
-                        glxvendor.c \
-                        glxfbconfig.c \
-                        glxswap.c
+                        unpack.h
 
-AM_CFLAGS = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/GL/include \
+AM_CFLAGS = -I$(top_srcdir)/hw/dmx \
+            -I$(top_srcdir)/include \
+            -I$(top_srcdir)/GL/include \
             -DHAVE_DMX_CONFIG_H \
             @DMXMODULES_CFLAGS@
diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am
index eb94ac174..7568f19f3 100644
--- a/hw/dmx/input/Makefile.am
+++ b/hw/dmx/input/Makefile.am
@@ -1,19 +1,57 @@
 noinst_LIBRARIES = libdmxinput.a
 
-RAWSRCS = lnx-keyboard.c lnx-ms.c lnx-ps2.c
-USBSRCS = usb-keyboard.c usb-mouse.c usb-other.c usb-common.c
-DRVSRCS = dmxdummy.c dmxbackend.c dmxconsole.c dmxcommon.c
-DMXSRCS = dmxinputinit.c dmxarg.c dmxsigio.c dmxevents.c \
-	  dmxxinput.c dmxmotion.c dmxeq.c dmxmap.c
+RAWSRCS = lnx-keyboard.c \
+          lnx-keyboard.h \
+          lnx-ms.c \
+          lnx-ms.h \
+          lnx-ps2.c \
+          lnx-ps2.h
+
+USBSRCS = usb-keyboard.c \
+          usb-keyboard.h \
+          usb-mouse.c \
+          usb-mouse.h \
+          usb-other.c \
+          usb-other.h \
+          usb-common.c \
+          usb-common.h \
+          usb-private.h
+
+DRVSRCS = dmxdummy.c \
+          dmxdummy.h \
+          dmxbackend.c \
+          dmxbackend.h \
+          dmxconsole.c \
+          dmxconsole.h \
+          dmxcommon.c \
+          dmxcommon.h
+
+DMXSRCS = dmxinputinit.c \
+          dmxinputinit.h \
+          dmxarg.c \
+          dmxarg.h \
+          dmxsigio.c \
+          dmxsigio.h \
+          dmxevents.c \
+          dmxevents.h \
+	  dmxxinput.c \
+          dmxmotion.c \
+          dmxmotion.h \
+          dmxeq.c \
+          dmxeq.h \
+          dmxmap.c \
+          dmxmap.h
 
 
 libdmxinput_a_SOURCES = ChkNotMaskEv.c \
+                        ChkNotMaskEv.h \
                         $(RAWSRCS) \
                         $(USBSRCS) \
                         $(DRVSRCS) \
                         $(DMXSRCS) \
                         $(LIBSRCS)
 
-AM_CFLAGS = -I.. -I../../xfree86/common \
+AM_CFLAGS = -I$(top_srcdir)/hw/dmx \
+            -I$(top_srcdir)/hw/xfree86/common \
             -DHAVE_DMX_CONFIG_H \
             @DMXMODULES_CFLAGS@
diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
index 2dc8670c6..2c799a5d6 100644
--- a/hw/vfb/Makefile.am
+++ b/hw/vfb/Makefile.am
@@ -2,6 +2,7 @@ bin_PROGRAMS = Xvfb
 
 SRCS =	InitInput.c \
 	InitOutput.c \
+	lk201kbd.h \
 	$(top_srcdir)/Xext/dpmsstubs.c \
 	$(top_srcdir)/Xi/stubs.c \
 	$(top_srcdir)/mi/miinitext.c \
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index b6cb1adaa..5549c4e11 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -6,6 +6,10 @@ SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
           ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
 	  xf8_32wid loader scanpci dixmods $(DRI_SUBDIR)
 
+DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
+               parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \
+               xf8_16bpp xf8_32wid loader scanpci dixmods dri
+
 bin_PROGRAMS = Xorg
 
 Xorg_SOURCES = dummy.c
diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am
index 50c5bb771..c03a36c30 100644
--- a/hw/xfree86/dixmods/extmod/Makefile.am
+++ b/hw/xfree86/dixmods/extmod/Makefile.am
@@ -2,9 +2,9 @@ sdk_HEADERS = dgaproc.h
 
 module_LTLIBRARIES = libextmod.la
 
-# DGA_SRCS = xf86dga.c xf86dga2.c
+# DGA_SRCS = xf86dga.c xf86dga2.c dgaproc.h xf86dgaext.h
 if XV
-XV_SRCS = xvmod.c
+XV_SRCS = xvmod.c xvmodproc.h
 endif
 
 AM_CFLAGS = @XORG_CFLAGS@
@@ -20,7 +20,10 @@ INCLUDES = @XORG_INCS@ \
 libextmod_la_LDFLAGS = -avoid-version
 libextmod_la_LIBADD = $(top_builddir)/Xext/libXext.la
 libextmod_la_SOURCES = modinit.c \
+                       modinit.h \
                        $(DGA_SRCS) \
                        xf86misc.c \
+                       xf86miscproc.h \
                        xf86vmode.c \
+                       vidmodeproc.h \
                        $(XV_SRCS)
diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am
index b83ae9142..9552bef4e 100644
--- a/hw/xfree86/os-support/Makefile.am
+++ b/hw/xfree86/os-support/Makefile.am
@@ -3,6 +3,7 @@ DRI_SUBDIRS=drm
 endif
 
 SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS)
+DIST_SUBDIRS = bus drm misc linux solaris
 
 sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h xf86drm.h \
               xf86drmCompat.h assyntax.h xf86OSKbd.h xf86OSmouse.h
diff --git a/hw/xfree86/x86emu/Makefile.am b/hw/xfree86/x86emu/Makefile.am
index 207ac1a58..5c1aec6ab 100644
--- a/hw/xfree86/x86emu/Makefile.am
+++ b/hw/xfree86/x86emu/Makefile.am
@@ -1,8 +1,26 @@
 noinst_LIBRARIES = libx86emu.a
 
-libx86emu_a_SOURCES = debug.c  decode.c  fpu.c  ops2.c  ops.c  prim_ops.c  sys.c  validate.c
+libx86emu_a_SOURCES = debug.c \
+                      decode.c \
+                      fpu.c \
+                      ops2.c \
+                      ops.c \
+                      prim_ops.c \
+                      sys.c \
+                      validate.c \
+                      x86emu.h
 
 INCLUDES = 
 
 AM_CFLAGS = $(XORG_CFLAGS)
 
+EXTRA_DIST = x86emu/debug.h \
+             x86emu/decode.h \
+             x86emu/fpu.h \
+             x86emu/fpu_regs.h \
+             x86emu/ops.h \
+             x86emu/prim_asm.h \
+             x86emu/prim_ops.h \
+             x86emu/regs.h \
+             x86emu/types.h \
+             x86emu/x86emui.h
diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am
index 0fb415be5..f3ddefbba 100644
--- a/hw/xnest/Makefile.am
+++ b/hw/xnest/Makefile.am
@@ -36,6 +36,7 @@ SRCS =	Args.c \
 	XNGC.h \
 	XNPixmap.h \
 	XNWindow.h \
+	xnest-config.h \
 	$(top_srcdir)/Xext/dpmsstubs.c \
 	$(top_srcdir)/Xi/stubs.c \
 	$(top_srcdir)/mi/miinitext.c \
@@ -55,7 +56,9 @@ AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
             -DXFree86Server \
             $(XNESTMODULES_CFLAGS)
 
-EXTRA_DIST = os2Stub.c
+EXTRA_DIST = os2Stub.c \
+             icon \
+             screensaver
 
 # -UDPMSExtension for miinitext? can't put into 
 # OS_DEFINES???
diff --git a/miext/Makefile.am b/miext/Makefile.am
index aa3ab5681..ea839f753 100644
--- a/miext/Makefile.am
+++ b/miext/Makefile.am
@@ -2,3 +2,4 @@ SUBDIRS = damage shadow layer
 if COMPOSITE
 SUBDIRS += cw
 endif
+DIST_SUBDIRS = damage shadow layer cw