diff options
author | Kevin E Martin <kem@kem.org> | 2005-07-28 23:28:34 +0000 |
---|---|---|
committer | Kevin E Martin <kem@kem.org> | 2005-07-28 23:28:34 +0000 |
commit | 86529c07d6ff69ef936ee370be07b373e2961360 (patch) | |
tree | a0c3c9cf5efd50c2975ad930ee0803e77d5d089f /hw | |
parent | 3e4bf8a8f46e14078c64c56ad303c80cd9d8d5be (diff) |
Fix distcheck for server
Diffstat (limited to 'hw')
-rw-r--r-- | hw/Makefile.am | 2 | ||||
-rw-r--r-- | hw/dmx/Makefile.am | 53 | ||||
-rw-r--r-- | hw/dmx/config/Makefile.am | 13 | ||||
-rw-r--r-- | hw/dmx/glxProxy/Makefile.am | 38 | ||||
-rw-r--r-- | hw/dmx/input/Makefile.am | 50 | ||||
-rw-r--r-- | hw/vfb/Makefile.am | 1 | ||||
-rw-r--r-- | hw/xfree86/Makefile.am | 4 | ||||
-rw-r--r-- | hw/xfree86/dixmods/extmod/Makefile.am | 7 | ||||
-rw-r--r-- | hw/xfree86/os-support/Makefile.am | 1 | ||||
-rw-r--r-- | hw/xfree86/x86emu/Makefile.am | 20 | ||||
-rw-r--r-- | hw/xnest/Makefile.am | 5 |
11 files changed, 157 insertions, 37 deletions
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??? |