frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix distcheck for server

This commit is contained in:
Kevin E Martin 2005-07-28 23:28:34 +00:00
parent 3e4bf8a8f4
commit 86529c07d6
26 changed files with 176 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GL/mesa/X/Makefile.am
View File

@ -17,7 +17,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
# terribly gross hack. i need a shower now. # terribly gross hack. i need a shower now.
AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server
libX_la_SOURCES = xf86glx.c \ nodist_libX_la_SOURCES = xf86glx.c \
xf86glx_util.c \ xf86glx_util.c \
xm_api.c \ xm_api.c \
xm_buffer.c \ xm_buffer.c \

2
GL/mesa/array_cache/Makefile.am
View File

@ -12,4 +12,4 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I$(srcdir)/../tnl \ -I$(srcdir)/../tnl \
-I$(srcdir)/.. -I$(srcdir)/..
libac_la_SOURCES = ac_context.c ac_import.c nodist_libac_la_SOURCES = ac_context.c ac_import.c

2
GL/mesa/glapi/Makefile.am
View File

@ -12,4 +12,4 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I$(srcdir)/../tnl \ -I$(srcdir)/../tnl \
-I$(srcdir)/.. -I$(srcdir)/..
libglapi_la_SOURCES = glapi.c glthread.c nodist_libglapi_la_SOURCES = glapi.c glthread.c

2
GL/mesa/main/Makefile.am
View File

@ -12,7 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I$(srcdir)/../tnl \ -I$(srcdir)/../tnl \
-I$(srcdir)/.. -I$(srcdir)/..
libmain_la_SOURCES = accum.c \ nodist_libmain_la_SOURCES = accum.c \
api_arrayelt.c \ api_arrayelt.c \
api_loopback.c \ api_loopback.c \
api_noop.c \ api_noop.c \

2
GL/mesa/math/Makefile.am
View File

@ -12,7 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I$(srcdir)/../tnl \ -I$(srcdir)/../tnl \
-I$(srcdir)/.. -I$(srcdir)/..
libmath_la_SOURCES = m_debug_clip.c \ nodist_libmath_la_SOURCES = m_debug_clip.c \
m_debug_norm.c \ m_debug_norm.c \
m_debug_xform.c \ m_debug_xform.c \
m_eval.c \ m_eval.c \

2
GL/mesa/shader/Makefile.am
View File

@ -16,7 +16,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I$(srcdir)/../tnl \ -I$(srcdir)/../tnl \
-I$(srcdir)/.. -I$(srcdir)/..
libshader_la_SOURCES = arbfragparse.c \ nodist_libshader_la_SOURCES = arbfragparse.c \
arbprogparse.c \ arbprogparse.c \
arbprogram.c \ arbprogram.c \
arbvertparse.c \ arbvertparse.c \

2
GL/mesa/shader/grammar/Makefile.am
View File

@ -12,4 +12,4 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I$(srcdir)/../../tnl \ -I$(srcdir)/../../tnl \
-I$(srcdir)/../.. -I$(srcdir)/../..
libgrammar_la_SOURCES = grammar_mesa.c nodist_libgrammar_la_SOURCES = grammar_mesa.c

2
GL/mesa/shader/slang/Makefile.am
View File

@ -13,7 +13,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I$(srcdir)/../../tnl \ -I$(srcdir)/../../tnl \
-I$(srcdir)/../.. -I$(srcdir)/../..
libslang_la_SOURCES = slang_assemble_assignment.c \ nodist_libslang_la_SOURCES = slang_assemble_assignment.c \
slang_assemble.c \ slang_assemble.c \
slang_assemble_conditional.c \ slang_assemble_conditional.c \
slang_assemble_constructor.c \ slang_assemble_constructor.c \

2
GL/mesa/swrast/Makefile.am
View File

@ -12,7 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I$(srcdir)/../tnl \ -I$(srcdir)/../tnl \
-I$(srcdir)/.. -I$(srcdir)/..
libswrast_la_SOURCES = s_aaline.c \ nodist_libswrast_la_SOURCES = s_aaline.c \
s_aatriangle.c \ s_aatriangle.c \
s_accum.c \ s_accum.c \
s_alpha.c \ s_alpha.c \

2
GL/mesa/swrast_setup/Makefile.am
View File

@ -12,4 +12,4 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I$(srcdir)/../tnl \ -I$(srcdir)/../tnl \
-I$(srcdir)/.. -I$(srcdir)/..
libss_la_SOURCES = ss_context.c ss_triangle.c nodist_libss_la_SOURCES = ss_context.c ss_triangle.c

2
GL/mesa/tnl/Makefile.am
View File

@ -12,7 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I$(srcdir)/../tnl \ -I$(srcdir)/../tnl \
-I$(srcdir)/.. -I$(srcdir)/..
libtnl_la_SOURCES = t_array_api.c \ nodist_libtnl_la_SOURCES = t_array_api.c \
t_array_import.c \ t_array_import.c \
t_context.c \ t_context.c \
t_pipeline.c \ t_pipeline.c \

7
Xext/Makefile.am
View File

@ -2,8 +2,6 @@ noinst_LTLIBRARIES = libXext.la
sdk_HEADERS = xvdix.h xvmcext.h sdk_HEADERS = xvdix.h xvmcext.h
SUBDIRS = extmod
if MITSHM if MITSHM
MITSHM_SRCS = shm.c MITSHM_SRCS = shm.c
endif endif
@ -32,14 +30,13 @@ if XEVIE
XEVIE_SRCS = xevie.c EVIstruct.h XEVIE_SRCS = xevie.c EVIstruct.h
endif endif
INCLUDES = -I$(srcdir)/extmod -I$(top_builddir)/hw/xfree86/dixmods/extmod INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
AM_CFLAGS = $(DIX_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS)
EXTRA_DIST = \ EXTRA_DIST = \
appgroup.h \ appgroup.h \
xvdisp.h \ xvdisp.h
xvmodproc.h
# dmx.c has a hard dependency on the dmx DDX # dmx.c has a hard dependency on the dmx DDX
libXext_la_SOURCES = \ libXext_la_SOURCES = \

3
Xext/extmod/Makefile.am
View File

@ -1,3 +0,0 @@
AM_CFLAGS = $(DIX_CFLAGS)
EXTRA_DIST = modinit.h

1
configure.ac
View File

@ -815,7 +815,6 @@ randr/Makefile
render/Makefile render/Makefile
xkb/Makefile xkb/Makefile
Xext/Makefile Xext/Makefile
Xext/extmod/Makefile
Xi/Makefile Xi/Makefile
xfixes/Makefile xfixes/Makefile
hw/Makefile hw/Makefile

2
hw/Makefile.am
View File

@ -24,3 +24,5 @@ SUBDIRS = \
$(XVFB_SUBDIRS) \ $(XVFB_SUBDIRS) \
$(XNEST_SUBDIRS) \ $(XNEST_SUBDIRS) \
$(DMX_SUBDIRS) $(DMX_SUBDIRS)
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin

63
hw/dmx/Makefile.am
View File

@ -1,3 +1,5 @@
DIST_SUBDIRS = input config glxProxy
SUBDIRS = input config SUBDIRS = input config
bin_PROGRAMS = Xdmx bin_PROGRAMS = Xdmx
@ -8,31 +10,54 @@ endif
if GLX if GLX
SUBDIRS += glxProxy SUBDIRS += glxProxy
GLX_LIBS = glxProxy/libglxproxy.a 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 GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
endif endif
Xdmx_SOURCES = dmxinit.c \ Xdmx_SOURCES = dmx.c \
dmxscrinit.c \
dmxshadow.c \
dmxcursor.c \
dmxinput.c \
dmxdpms.c \
dmxgc.c \
dmxgcops.c \
dmxwindow.c \
dmxpixmap.c \
dmxfont.c \
dmxcmap.c \
dmxvisual.c \
dmxlog.c \
dmxcb.c \ dmxcb.c \
dmxprop.c \ dmxcb.h \
dmxstat.c \ dmxclient.h \
dmxsync.c \ dmxcmap.c \
dmxcmap.h \
dmx-config.h \
dmxcursor.c \
dmxcursor.h \
dmxdpms.c \
dmxdpms.h \
dmxextension.c \ dmxextension.c \
dmxextension.h \
dmxfont.c \
dmxfont.h \
dmxgc.c \
dmxgc.h \
dmxgcops.c \
dmxgcops.h \
dmx.h \
dmxinit.c \
dmxinit.h \
dmxinput.c \
dmxinput.h \
dmxlog.c \
dmxlog.h \
dmxpict.c \ dmxpict.c \
dmx.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 \
dmxsync.h \
dmxvisual.c \
dmxvisual.h \
dmxwindow.c \
dmxwindow.h \
$(top_srcdir)/fb/fbcmap.c \ $(top_srcdir)/fb/fbcmap.c \
$(top_srcdir)/mi/miinitext.c \ $(top_srcdir)/mi/miinitext.c \
$(GLX_SRCS) $(GLX_SRCS)

13
hw/dmx/config/Makefile.am
View File

@ -1,6 +1,15 @@
noinst_LIBRARIES = libdmxconfig.a 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 parser.h: parser.c
scanner.c: scanner.l parser.h scanner.c: scanner.l parser.h
@ -9,5 +18,5 @@ CLEANFILES = parser.c parser.h scanner.c
libdmxconfig_a_SOURCES = $(LIBSRCS) 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 AM_YFLAGS = -d

38
hw/dmx/glxProxy/Makefile.am
View File

@ -1,22 +1,38 @@
noinst_LIBRARIES = libglxproxy.a 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 \ glxcmds.c \
glxcmdsswap.c \
glxcontext.h \
glxdrawable.h \
glxerror.h \
glxext.c \ 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.c \
glxutil.h \
glxvendor.c \
glxvendor.h \
glxvisuals.c \
glxvisuals.h \
g_renderswap.c \ g_renderswap.c \
render2swap.c \ render2swap.c \
renderpixswap.c \ renderpixswap.c \
global.c \ unpack.h
glxcmdsswap.c \
compsize.c \
glxscreens.c \
glxvisuals.c \
glxsingle.c \
glxvendor.c \
glxfbconfig.c \
glxswap.c
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 \ -DHAVE_DMX_CONFIG_H \
@DMXMODULES_CFLAGS@ @DMXMODULES_CFLAGS@

50
hw/dmx/input/Makefile.am
View File

@ -1,19 +1,57 @@
noinst_LIBRARIES = libdmxinput.a noinst_LIBRARIES = libdmxinput.a
RAWSRCS = lnx-keyboard.c lnx-ms.c lnx-ps2.c RAWSRCS = lnx-keyboard.c \
USBSRCS = usb-keyboard.c usb-mouse.c usb-other.c usb-common.c lnx-keyboard.h \
DRVSRCS = dmxdummy.c dmxbackend.c dmxconsole.c dmxcommon.c lnx-ms.c \
DMXSRCS = dmxinputinit.c dmxarg.c dmxsigio.c dmxevents.c \ lnx-ms.h \
dmxxinput.c dmxmotion.c dmxeq.c dmxmap.c 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 \ libdmxinput_a_SOURCES = ChkNotMaskEv.c \
ChkNotMaskEv.h \
$(RAWSRCS) \ $(RAWSRCS) \
$(USBSRCS) \ $(USBSRCS) \
$(DRVSRCS) \ $(DRVSRCS) \
$(DMXSRCS) \ $(DMXSRCS) \
$(LIBSRCS) $(LIBSRCS)
AM_CFLAGS = -I.. -I../../xfree86/common \ AM_CFLAGS = -I$(top_srcdir)/hw/dmx \
-I$(top_srcdir)/hw/xfree86/common \
-DHAVE_DMX_CONFIG_H \ -DHAVE_DMX_CONFIG_H \
@DMXMODULES_CFLAGS@ @DMXMODULES_CFLAGS@

1
hw/vfb/Makefile.am
View File

@ -2,6 +2,7 @@ bin_PROGRAMS = Xvfb
SRCS = InitInput.c \ SRCS = InitInput.c \
InitOutput.c \ InitOutput.c \
lk201kbd.h \
$(top_srcdir)/Xext/dpmsstubs.c \ $(top_srcdir)/Xext/dpmsstubs.c \
$(top_srcdir)/Xi/stubs.c \ $(top_srcdir)/Xi/stubs.c \
$(top_srcdir)/mi/miinitext.c \ $(top_srcdir)/mi/miinitext.c \

4
hw/xfree86/Makefile.am
View File

@ -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 \ ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
xf8_32wid loader scanpci dixmods $(DRI_SUBDIR) 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 bin_PROGRAMS = Xorg
Xorg_SOURCES = dummy.c Xorg_SOURCES = dummy.c

7
hw/xfree86/dixmods/extmod/Makefile.am
View File

@ -2,9 +2,9 @@ sdk_HEADERS = dgaproc.h
module_LTLIBRARIES = libextmod.la module_LTLIBRARIES = libextmod.la
# DGA_SRCS = xf86dga.c xf86dga2.c # DGA_SRCS = xf86dga.c xf86dga2.c dgaproc.h xf86dgaext.h
if XV if XV
XV_SRCS = xvmod.c XV_SRCS = xvmod.c xvmodproc.h
endif endif
AM_CFLAGS = @XORG_CFLAGS@ AM_CFLAGS = @XORG_CFLAGS@
@ -20,7 +20,10 @@ INCLUDES = @XORG_INCS@ \
libextmod_la_LDFLAGS = -avoid-version libextmod_la_LDFLAGS = -avoid-version
libextmod_la_LIBADD = $(top_builddir)/Xext/libXext.la libextmod_la_LIBADD = $(top_builddir)/Xext/libXext.la
libextmod_la_SOURCES = modinit.c \ libextmod_la_SOURCES = modinit.c \
modinit.h \
$(DGA_SRCS) \ $(DGA_SRCS) \
xf86misc.c \ xf86misc.c \
xf86miscproc.h \
xf86vmode.c \ xf86vmode.c \
vidmodeproc.h \
$(XV_SRCS) $(XV_SRCS)

1
hw/xfree86/os-support/Makefile.am
View File

@ -3,6 +3,7 @@ DRI_SUBDIRS=drm
endif endif
SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS) 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 \ sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h xf86drm.h \
xf86drmCompat.h assyntax.h xf86OSKbd.h xf86OSmouse.h xf86drmCompat.h assyntax.h xf86OSKbd.h xf86OSmouse.h

20
hw/xfree86/x86emu/Makefile.am
View File

@ -1,8 +1,26 @@
noinst_LIBRARIES = libx86emu.a 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 = INCLUDES =
AM_CFLAGS = $(XORG_CFLAGS) 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

5
hw/xnest/Makefile.am
View File

@ -36,6 +36,7 @@ SRCS = Args.c \
XNGC.h \ XNGC.h \
XNPixmap.h \ XNPixmap.h \
XNWindow.h \ XNWindow.h \
xnest-config.h \
$(top_srcdir)/Xext/dpmsstubs.c \ $(top_srcdir)/Xext/dpmsstubs.c \
$(top_srcdir)/Xi/stubs.c \ $(top_srcdir)/Xi/stubs.c \
$(top_srcdir)/mi/miinitext.c \ $(top_srcdir)/mi/miinitext.c \
@ -55,7 +56,9 @@ AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
-DXFree86Server \ -DXFree86Server \
$(XNESTMODULES_CFLAGS) $(XNESTMODULES_CFLAGS)
EXTRA_DIST = os2Stub.c EXTRA_DIST = os2Stub.c \
icon \
screensaver
# -UDPMSExtension for miinitext? can't put into # -UDPMSExtension for miinitext? can't put into
# OS_DEFINES??? # OS_DEFINES???

1
miext/Makefile.am
View File

@ -2,3 +2,4 @@ SUBDIRS = damage shadow layer
if COMPOSITE if COMPOSITE
SUBDIRS += cw SUBDIRS += cw
endif endif
DIST_SUBDIRS = damage shadow layer cw