diff options
Diffstat (limited to 'hw/xfree86')
38 files changed, 0 insertions, 1066 deletions
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am deleted file mode 100644 index baf380d4d..000000000 --- a/hw/xfree86/Makefile.am +++ /dev/null @@ -1,154 +0,0 @@ - -if DRI -DRI_SUBDIR = dri -DRI_LIB = dri/libdri.la -endif - -if DRI2 -DRI2_SUBDIR = dri2 -DRI2_LIB = dri2/libdri2.la -endif - -if DRI3 -DRI3_BUILDDIR = $(top_builddir)/dri3 -DRI3_LIB = $(DRI3_BUILDDIR)/libdri3.la -endif - -if GLX -GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la -endif - -if GLAMOR_EGL -GLAMOR_EGL_SUBDIR = glamor_egl -endif - -if XF86UTILS -XF86UTILS_SUBDIR = utils -endif - -if VGAHW -VGAHW_SUBDIR = vgahw -endif - -if INT10MODULE -INT10_SUBDIR = int10 -endif - -SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \ - ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \ - $(DRI2_SUBDIR) . i2c dixmods xkb \ - fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man \ - $(GLAMOR_EGL_SUBDIR) drivers - -DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \ - parser ramdac shadowfb vgahw \ - loader dixmods xkb dri dri2 exa modes \ - utils doc man glamor_egl drivers - -bin_PROGRAMS = Xorg -nodist_Xorg_SOURCES = sdksyms.c - -AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser \ - -I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \ - -I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3 - -LOCAL_LIBS = \ - $(MAIN_LIB) \ - $(XSERVER_LIBS) \ - loader/libloader.la \ - common/libcommon.la \ - os-support/libxorgos.la \ - parser/libxf86config.la \ - dixmods/libdixmods.la \ - modes/libxf86modes.la \ - ramdac/libramdac.la \ - ddc/libddc.la \ - i2c/libi2c.la \ - $(XORG_LIBS) \ - xkb/libxorgxkb.la \ - $(DRI_LIB) \ - $(DRI2_LIB) \ - $(DRI3_LIB) \ - $(GLXVND_LIB) \ - $(top_builddir)/fb/libfb.la \ - $(top_builddir)/miext/sync/libsync.la \ - $(top_builddir)/mi/libmi.la \ - $(top_builddir)/os/libos.la \ - $(top_builddir)/Xext/libXvidmode.la - -Xorg_LDADD = \ - $(LOCAL_LIBS) \ - $(XORG_SYS_LIBS) \ - $(XSERVER_SYS_LIBS) -Xorg_DEPENDENCIES = $(LOCAL_LIBS) - -Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) - -if SUID_WRAPPER -wrapexecdir = $(SUID_WRAPPER_DIR) -wrapexec_PROGRAMS = Xorg.wrap -Xorg_wrap_SOURCES = xorg-wrapper.c -endif - -BUILT_SOURCES = xorg.conf.example -DISTCLEANFILES = xorg.conf.example -EXTRA_DIST = xorgconf.cpp - -# Without logdir, X will post an error on the terminal and will not start -install-data-local: - $(AM_V_GEN)$(MKDIR_P) $(DESTDIR)$(logdir) -if CYGWIN - $(INSTALL_DATA) libXorg.exe.a $(DESTDIR)$(libdir)/libXorg.exe.a -endif - -install-exec-hook: - (cd $(DESTDIR)$(bindir) && rm -f X && $(LN_S) Xorg$(EXEEXT) X) -if INSTALL_SETUID - chown 0 $(DESTDIR)$(bindir)/Xorg - chmod u+s $(DESTDIR)$(bindir)/Xorg -endif -if SUID_WRAPPER - $(MKDIR_P) $(DESTDIR)$(SUID_WRAPPER_DIR) - mv $(DESTDIR)$(bindir)/Xorg $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg - ${INSTALL} -m 755 Xorg.sh $(DESTDIR)$(bindir)/Xorg - -chown 0 $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap && chmod u+s $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap -endif - -uninstall-local: -if CYGWIN - $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXorg.exe.a -endif - -uninstall-hook: - $(AM_V_at)rm -f $(DESTDIR)$(bindir)/X - -# Use variables from XORG_MANPAGE_SECTIONS and X Server configuration -# Do not include manpages.am as values are not appropriate for rc files -CONF_SUBSTS = -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \ - -e 's|MODULEPATH|$(DEFAULT_MODULE_PATH)|g' \ - -e 's|DEFAULTFONTPATH|$(COMPILEDDEFAULTFONTPATH)|g' - -xorg.conf.example: xorgconf.cpp - $(AM_V_GEN)$(SED) $(CONF_SUBSTS) < $(srcdir)/xorgconf.cpp > $@ - -relink: - $(AM_V_at)rm -f Xorg$(EXEEXT) && $(MAKE) Xorg$(EXEEXT) - -CLEANFILES = sdksyms.c sdksyms.dep Xorg.sh -EXTRA_DIST += sdksyms.sh - -sdksyms.dep sdksyms.c: sdksyms.sh - $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS) - -SDKSYMS_DEP = sdksyms.dep --include $(SDKSYMS_DEP) - -i2c/libi2c.la: - $(AM_V_at)cd i2c && $(MAKE) libi2c.la - -dixmods/libdixmods.la: - $(AM_V_at)cd dixmods && $(MAKE) libdixmods.la - -xkb/libxorgxkb.la: - $(AM_V_at)cd xkb && $(MAKE) libxorgxkb.la diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am deleted file mode 100644 index 39c1e90f0..000000000 --- a/hw/xfree86/common/Makefile.am +++ /dev/null @@ -1,104 +0,0 @@ -noinst_LTLIBRARIES = libcommon.la - -if XORG_BUS_PCI -PCI_SOURCES = xf86pciBus.c xf86VGAarbiter.c xf86VGAarbiter.h \ - xf86VGAarbiterPriv.h -endif - -if XORG_BUS_SPARC -SBUS_SOURCES = xf86sbusBus.c -endif - -if XV -XVSOURCES = xf86xv.c xf86xvmc.c -XVSDKINCS = xf86xv.h xf86xvmc.h xf86xvpriv.h -endif - -if DGA -DGASOURCES = xf86DGA.c -DGA_SDK = dgaproc.h -endif - -if XORG_BUS_PLATFORM -PLATSOURCES = xf86platformBus.c -endif - -RANDRSOURCES = xf86RandR.c - -BUSSOURCES = xf86fbBus.c xf86noBus.c $(PCI_SOURCES) $(SBUS_SOURCES) $(PLATSOURCES) - -MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes - -xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES) - $(AM_V_GEN)cat $(MODEDEFSOURCES) | LC_ALL=C $(AWK) -f $(srcdir)/modeline2c.awk > $@ - $(AM_V_GEN)echo >> $@ - -BUILT_SOURCES = xf86DefModeSet.c - -AM_LDFLAGS = -r -libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \ - xf86Cursor.c $(DGASOURCES) xf86DPMS.c \ - xf86Events.c xf86Globals.c xf86AutoConfig.c \ - xf86Option.c xf86Init.c \ - xf86VidMode.c xf86fbman.c xf86cmap.c \ - xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \ - xf86Mode.c xorgHelper.c xf86Extensions.h \ - xf86Extensions.c $(XF86VMODESOURCES) \ - $(XVSOURCES) $(BUSSOURCES) $(RANDRSOURCES) -nodist_libcommon_la_SOURCES = xf86DefModeSet.c -libcommon_la_LIBADD = $(top_builddir)/config/libconfig.la - -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \ - -I$(srcdir)/../loader -I$(srcdir)/../parser \ - -I$(srcdir)/../vbe -I$(srcdir)/../int10 \ - -I$(srcdir)/../vgahw -I$(srcdir)/../dixmods/extmod \ - -I$(srcdir)/../modes -I$(srcdir)/../ramdac -I$(srcdir)/../dri2 \ - -I$(top_builddir) - -sdk_HEADERS = compiler.h xf86.h xf86Module.h xf86Opt.h \ - xf86PciInfo.h xf86Priv.h xf86Privstr.h \ - xf86cmap.h xf86fbman.h xf86str.h xf86Xinput.h xisb.h \ - $(XVSDKINCS) $(XF86VMODE_SDK) $(DGA_SDK) xorgVersion.h \ - xf86sbusBus.h xf86VGAarbiter.h xf86Optionstr.h \ - xf86platformBus.h xf86MatchDrivers.h \ - xaarop.h - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - compiler.h \ - xf86.h \ - xf86Bus.h \ - xf86Config.h \ - xf86InPriv.h \ - xf86Module.h \ - xf86Opt.h \ - xf86PciInfo.h \ - xf86Priv.h \ - xf86Privstr.h \ - xf86Xinput.h \ - xf86cmap.h \ - xf86fbman.h \ - xf86pciBus.h \ - xf86str.h \ - xf86xv.h \ - xf86xvmc.h \ - xf86xvpriv.h \ - xisb.h \ - xorgVersion.h \ - $(MODEDEFSOURCES) \ - modeline2c.awk \ - xf86VGAarbiter.h \ - xf86VGAarbiterPriv.h \ - $(DISTKBDSOURCES) \ - xaarop.h - -if LNXACPI -XORG_CFLAGS += -DHAVE_ACPI -endif - -if NEED_DBUS -XORG_CFLAGS += $(DBUS_CFLAGS) -endif - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) diff --git a/hw/xfree86/ddc/Makefile.am b/hw/xfree86/ddc/Makefile.am deleted file mode 100644 index a7b84adcd..000000000 --- a/hw/xfree86/ddc/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -sdk_HEADERS = edid.h xf86DDC.h - -noinst_LTLIBRARIES = libddc.la - -libddc_la_SOURCES = ddc.c interpret_edid.c print_edid.c ddcProperty.c - -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../i2c - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) - -EXTRA_DIST = DDC.HOWTO diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am deleted file mode 100644 index 3d5811066..000000000 --- a/hw/xfree86/dixmods/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -noinst_LTLIBRARIES = libdixmods.la - -if GLX -GLXMODS = libglx.la -endif - -module_LTLIBRARIES = libwfb.la \ - libshadow.la - -extsmoduledir = $(moduledir)/extensions -extsmodule_LTLIBRARIES = $(GLXMODS) - -AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ -AM_CPPFLAGS = @XORG_INCS@ \ - -I$(top_srcdir)/hw/xfree86/loader \ - -I$(top_srcdir)/miext/shadow \ - -I$(top_srcdir)/glx - -libwfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -libwfb_la_LIBADD = $(top_builddir)/fb/libwfb.la -libwfb_la_SOURCES = fbmodule.c -libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER - -libglx_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -libglx_la_LIBADD = $(top_builddir)/glx/libglx.la $(GLX_SYS_LIBS) -if DRI2 -libglx_la_LIBADD += $(top_builddir)/glx/libglxdri.la -if NO_UNDEFINED -libglx_la_LIBADD += $(LIBDRM_LIBS) $(PIXMAN_LIBS) -endif -endif -libglx_la_SOURCES = glxmodule.c - -libshadow_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la -libshadow_la_SOURCES = shmodule.c - -libdixmods_la_SOURCES = \ - $(top_srcdir)/mi/miinitext.c \ - $(top_srcdir)/mi/miinitext.h -libdixmods_la_CFLAGS = $(AM_CFLAGS) diff --git a/hw/xfree86/doc/Makefile.am b/hw/xfree86/doc/Makefile.am deleted file mode 100644 index 392bdfa03..000000000 --- a/hw/xfree86/doc/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ - -if ENABLE_DEVEL_DOCS -if HAVE_XMLTO - -# Main DocBook/XML files (DOCTYPE book) -docbook = ddxDesign.xml - -# Generate DocBook/XML output formats with or without stylesheets -include $(top_srcdir)/devbook.am - -endif HAVE_XMLTO -endif ENABLE_DEVEL_DOCS - -EXTRA_DIST = \ - Registry \ - exa-driver.txt \ - README.modes diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am deleted file mode 100644 index ced04ff38..000000000 --- a/hw/xfree86/dri/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -noinst_LTLIBRARIES = libdri.la -AM_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ - -I$(top_srcdir)/hw/xfree86/os-support \ - -I$(top_srcdir)/hw/xfree86/modes \ - -I$(top_srcdir)/hw/xfree86/ddc \ - -I$(top_srcdir)/hw/xfree86/i2c \ - -I$(top_srcdir)/hw/xfree86/parser \ - -I$(top_srcdir)/hw/xfree86/ramdac \ - -I$(top_srcdir)/hw/xfree86/os-support/bus \ - -I$(top_srcdir)/glx \ - -DHAVE_XORG_CONFIG_H \ - @DIX_CFLAGS@ @XORG_CFLAGS@ -libdri_la_SOURCES = \ - dri.c \ - dri.h \ - dristruct.h \ - sarea.h \ - xf86dri.c - -sdk_HEADERS = dri.h sarea.h dristruct.h diff --git a/hw/xfree86/dri2/Makefile.am b/hw/xfree86/dri2/Makefile.am deleted file mode 100644 index 78e507bd3..000000000 --- a/hw/xfree86/dri2/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -SUBDIRS=pci_ids - -noinst_LTLIBRARIES = libdri2.la -AM_CFLAGS = \ - -DHAVE_XORG_CONFIG_H \ - @DIX_CFLAGS@ @XORG_CFLAGS@ \ - -I$(top_srcdir)/hw/xfree86/common \ - -I$(top_srcdir)/hw/xfree86/os-support/bus - -libdri2_la_SOURCES = \ - dri2.c \ - dri2.h \ - dri2ext.c \ - dri2int.h - -sdk_HEADERS = dri2.h diff --git a/hw/xfree86/dri2/pci_ids/Makefile.am b/hw/xfree86/dri2/pci_ids/Makefile.am deleted file mode 100644 index 69fe8c40d..000000000 --- a/hw/xfree86/dri2/pci_ids/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -EXTRA_DIST = \ - pci_id_driver_map.h \ - i810_pci_ids.h \ - i915_pci_ids.h \ - i965_pci_ids.h \ - r200_pci_ids.h \ - r300_pci_ids.h \ - r600_pci_ids.h \ - radeon_pci_ids.h \ - radeonsi_pci_ids.h \ - virtio_gpu_pci_ids.h \ - vmwgfx_pci_ids.h diff --git a/hw/xfree86/drivers/Makefile.am b/hw/xfree86/drivers/Makefile.am deleted file mode 100644 index 954c9f1d4..000000000 --- a/hw/xfree86/drivers/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -SUBDIRS = - -if XORG_DRIVER_MODESETTING -SUBDIRS += modesetting -endif -if XORG_DRIVER_INPUT_INPUTTEST -SUBDIRS += inputtest -endif diff --git a/hw/xfree86/drivers/inputtest/Makefile.am b/hw/xfree86/drivers/inputtest/Makefile.am deleted file mode 100644 index f6210aa8d..000000000 --- a/hw/xfree86/drivers/inputtest/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2005 Adam Jackson. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, and/or sell copies of the Software, and to permit persons to whom -# the Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -# this is obnoxious: -# -module lets us name the module exactly how we want -# -avoid-version prevents gratuitous .0.0.0 version numbers on the end -# _ladir passes a dummy rpath to libtool so the thing will actually link -# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. - -include $(top_srcdir)/manpages.am - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) $(CWARNFLAGS) - -AM_CPPFLAGS = $(XORG_INCS) - -inputtest_drv_la_LTLIBRARIES = inputtest_drv.la -inputtest_drv_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -inputtest_drv_ladir = @moduledir@/input - -inputtest_drv_la_SOURCES = xf86-input-inputtest.c xf86-input-inputtest-protocol.h - -sdk_HEADERS = xf86-input-inputtest-protocol.h - -drivermandir = $(DRIVER_MAN_DIR) -driverman_PRE = inputtestdrv.man -driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) - -EXTRA_DIST = inputtestdrv.man - -CLEANFILES = $(driverman_DATA) - diff --git a/hw/xfree86/drivers/modesetting/Makefile.am b/hw/xfree86/drivers/modesetting/Makefile.am deleted file mode 100644 index 961c57408..000000000 --- a/hw/xfree86/drivers/modesetting/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2005 Adam Jackson. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, and/or sell copies of the Software, and to permit persons to whom -# the Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -# this is obnoxious: -# -module lets us name the module exactly how we want -# -avoid-version prevents gratuitous .0.0.0 version numbers on the end -# _ladir passes a dummy rpath to libtool so the thing will actually link -# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. - -include $(top_srcdir)/manpages.am - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) $(LIBDRM_CFLAGS) $(UDEV_CFLAGS) $(CWARNFLAGS) - -AM_CPPFLAGS = \ - $(XORG_INCS) \ - -I$(top_srcdir)/glamor \ - -I$(srcdir)/../../ddc \ - -I$(srcdir)/../../dri2 \ - -I$(srcdir)/../../i2c \ - -I$(srcdir)/../../modes \ - -I$(srcdir)/../../parser \ - -I$(srcdir)/../../ramdac \ - $(NULL) - -modesetting_drv_la_LTLIBRARIES = modesetting_drv.la -modesetting_drv_la_LDFLAGS = -module -avoid-version -modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS) -modesetting_drv_ladir = @moduledir@/drivers - -modesetting_drv_la_SOURCES = \ - dri2.c \ - driver.c \ - driver.h \ - drmmode_display.c \ - drmmode_display.h \ - dumb_bo.c \ - dumb_bo.h \ - present.c \ - vblank.c \ - pageflip.c \ - $(NULL) - -drivermandir = $(DRIVER_MAN_DIR) -driverman_PRE = modesetting.man -driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) - -EXTRA_DIST = modesetting.man - -CLEANFILES = $(driverman_DATA) diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am deleted file mode 100644 index ccbb305d3..000000000 --- a/hw/xfree86/exa/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -SUBDIRS = man - -module_LTLIBRARIES = libexa.la - -libexa_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) - -AM_CPPFLAGS = \ - $(XORG_INCS) \ - -I$(srcdir)/../../../exa - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) - -libexa_la_SOURCES = \ - examodule.c - -libexa_la_LIBADD = \ - ../../../exa/libexa.la $(PIXMAN_LIBS) diff --git a/hw/xfree86/exa/man/Makefile.am b/hw/xfree86/exa/man/Makefile.am deleted file mode 100644 index 51da4fd50..000000000 --- a/hw/xfree86/exa/man/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -include $(top_srcdir)/manpages.am -driverman_PRE = exa.man diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am deleted file mode 100644 index 37cd88c0e..000000000 --- a/hw/xfree86/fbdevhw/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -SUBDIRS = man - -module_LTLIBRARIES = libfbdevhw.la - -libfbdevhw_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) - -if FBDEVHW -libfbdevhw_la_SOURCES = fbdevhw.c -else -libfbdevhw_la_SOURCES = fbdevhwstub.c -endif - -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../i2c -I$(srcdir)/../modes -I$(srcdir)/../ddc -I$(srcdir)/../parser - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) - -sdk_HEADERS = fbdevhw.h - -EXTRA_DIST = fbpriv.h README diff --git a/hw/xfree86/fbdevhw/man/Makefile.am b/hw/xfree86/fbdevhw/man/Makefile.am deleted file mode 100644 index 7f22a12b9..000000000 --- a/hw/xfree86/fbdevhw/man/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -include $(top_srcdir)/manpages.am -driverman_PRE = fbdevhw.man diff --git a/hw/xfree86/glamor_egl/Makefile.am b/hw/xfree86/glamor_egl/Makefile.am deleted file mode 100644 index e697c8296..000000000 --- a/hw/xfree86/glamor_egl/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright © 2013 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -module_LTLIBRARIES = libglamoregl.la - -libglamoregl_la_SOURCES = \ - $(top_srcdir)/glamor/glamor_egl.c \ - $(top_srcdir)/glamor/glamor_eglmodule.c \ - glamor_xf86_xv.c \ - $() - -libglamoregl_la_LDFLAGS = \ - -avoid-version \ - $(GBM_LIBS) \ - $() - -libglamoregl_la_LIBADD = \ - $(top_builddir)/glamor/libglamor.la \ - $() - -AM_CPPFLAGS = $(XORG_INCS) \ - -I$(top_srcdir)/dri3 \ - -I$(top_srcdir)/glamor \ - $() - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) $(GLAMOR_CFLAGS) $(GBM_CFLAGS) diff --git a/hw/xfree86/i2c/Makefile.am b/hw/xfree86/i2c/Makefile.am deleted file mode 100644 index 8bf795ded..000000000 --- a/hw/xfree86/i2c/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -noinst_LTLIBRARIES = libi2c.la - -libi2c_la_SOURCES = xf86i2c.c - -AM_CPPFLAGS = $(XORG_INCS) - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) - -sdk_HEADERS = xf86i2c.h i2c_def.h diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am deleted file mode 100644 index 0248dc781..000000000 --- a/hw/xfree86/int10/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -module_LTLIBRARIES = libint10.la - -sdk_HEADERS = xf86int10.h vbe.h vbeModes.h - -EXTRA_CFLAGS = - -libint10_la_LDFLAGS = -avoid-version -libint10_la_LIBADD = $(PCIACCESS_LIBS) - -COMMON_SOURCES = \ - vbe.c \ - vbeModes.c \ - helper_exec.c \ - helper_mem.c \ - xf86int10.c \ - xf86int10module.c - -if I386_VIDEO -I386_VIDEO_CFLAGS = -D_PC -endif - -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../modes -I$(srcdir)/../i2c \ - -I$(srcdir)/../parser - -if INT10_VM86 -AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS) -libint10_la_SOURCES = \ - $(COMMON_SOURCES) \ - $(srcdir)/../os-support/linux/int10/vm86/linux_vm86.c \ - $(srcdir)/../os-support/linux/int10/linux.c -endif - -if INT10_X86EMU -AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_X86EMU -DNO_SYS_HEADERS \ - $(XORG_CFLAGS) $(EXTRA_CFLAGS) $(DIX_CFLAGS) -AM_CPPFLAGS += -I$(srcdir)/../x86emu -libint10_la_SOURCES = \ - $(COMMON_SOURCES) \ - xf86x86emu.c \ - generic.c \ - x86emu.c -endif - -if INT10_STUB -AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS) -libint10_la_SOURCES = stub.c xf86int10module.c -endif - -EXTRA_DIST = xf86x86emu.h INT10.HOWTO diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am deleted file mode 100644 index 3529a7acd..000000000 --- a/hw/xfree86/loader/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -noinst_LTLIBRARIES = libloader.la - -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../parser \ - -I$(srcdir)/../ddc -I$(srcdir)/../i2c -I$(srcdir)/../modes \ - -I$(srcdir)/../ramdac -I$(srcdir)/../dri -I$(srcdir)/../dri2 - -#AM_LDFLAGS = -r -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) - -EXTRA_DIST = \ - loader.h \ - loaderProcs.h - -libloader_la_SOURCES = \ - loader.c \ - loaderProcs.h \ - loadmod.c - -libloader_la_LIBADD = $(DLOPEN_LIBS) diff --git a/hw/xfree86/man/Makefile.am b/hw/xfree86/man/Makefile.am deleted file mode 100644 index 5da404cbb..000000000 --- a/hw/xfree86/man/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -include $(top_srcdir)/manpages.am -appman_PRE = Xorg.man -fileman_PRE = xorg.conf.man xorg.conf.d.man - -if SUID_WRAPPER -appman_PRE += Xorg.wrap.man -fileman_PRE += Xwrapper.config.man -else -EXTRA_DIST += Xorg.wrap.man Xwrapper.config.man -endif diff --git a/hw/xfree86/modes/Makefile.am b/hw/xfree86/modes/Makefile.am deleted file mode 100644 index 35a174b5b..000000000 --- a/hw/xfree86/modes/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -noinst_LTLIBRARIES = libxf86modes.la - -if DGA -DGA_SRCS = xf86DiDGA.c -endif - -libxf86modes_la_SOURCES = \ - xf86Crtc.c \ - xf86Crtc.h \ - xf86Cursors.c \ - xf86gtf.c \ - xf86EdidModes.c \ - xf86Modes.c \ - xf86Modes.h \ - xf86RandR12.c \ - xf86RandR12.h \ - xf86Rotate.c \ - $(DGA_SRCS) - -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \ - -I$(srcdir)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \ - -I$(srcdir)/../vbe -I$(srcdir)/../int10 \ - -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac \ - -I$(srcdir)/../dixmods/extmod - -sdk_HEADERS = \ - xf86Crtc.h \ - xf86Modes.h \ - xf86RandR12.h - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am deleted file mode 100644 index a0140a16d..000000000 --- a/hw/xfree86/os-support/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS) -DIST_SUBDIRS = bsd bus misc linux solaris stub hurd - -sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h - -EXTRA_DIST = int10Defines.h xf86OSpriv.h - -# to get the grouping semantics right, you have to glom these three together -# as one library, otherwise libtool will actively defeat your attempts to -# list them multiple times on the link line. -noinst_LTLIBRARIES = libxorgos.la -libxorgos_la_SOURCES = -libxorgos_la_LIBADD = @XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.la \ - bus/libbus.la \ - misc/libmisc.la - -AM_CFLAGS = $(DIX_CFLAGS) - diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am deleted file mode 100644 index 2311dc242..000000000 --- a/hw/xfree86/os-support/bsd/Makefile.am +++ /dev/null @@ -1,65 +0,0 @@ -noinst_LTLIBRARIES = libbsd.la - -# No APM support. -APM_SOURCES = $(srcdir)/../shared/pm_noop.c - -if FREEBSD_KLDLOAD -KMOD_SOURCES = bsd_kmod.c -else -KMOD_SOURCES = $(srcdir)/../shared/kmod_noop.c -endif - -if AGP -AGP_SOURCES = $(srcdir)/../linux/lnx_agp.c -else -AGP_SOURCES = $(srcdir)/../shared/agp_noop.c -endif - -if ALPHA_VIDEO -# Cheat here and piggyback other alpha bits on ALPHA_VIDEO. -ARCH_SOURCES = \ - alpha_video.c -endif - -if ARM_VIDEO -ARCH_SOURCES = arm_video.c -endif - -if I386_VIDEO -ARCH_SOURCES = i386_video.c -endif - -if PPC_VIDEO -ARCH_SOURCES = ppc_video.c -endif - -if SPARC64_VIDEO -# Cheat here and piggyback other sparc64 bits on SPARC64_VIDEO. -ARCH_SOURCES = \ - sparc64_video.c \ - $(srcdir)/../shared/ioperm_noop.c -endif - -# FIXME: NetBSD Aperture defines (configure.ac) -AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) - -AM_CPPFLAGS = $(XORG_INCS) - -libbsd_la_SOURCES = \ - $(srcdir)/../shared/posix_tty.c \ - $(srcdir)/../shared/sigio.c \ - $(srcdir)/../shared/vidmem.c \ - bsd_VTsw.c \ - bsd_init.c \ - bsd_bell.c \ - $(ARCH_SOURCES) \ - $(AGP_SOURCES) \ - $(APM_SOURCES) \ - $(AXP_SOURCES) \ - $(DRI_SOURCES) \ - $(KMOD_SOURCES) \ - $(RES_SOURCES) - -# FIXME: Add these files to the build as needed -EXTRA_DIST = \ - memrange.h diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am deleted file mode 100644 index eebb3aed6..000000000 --- a/hw/xfree86/os-support/bus/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -noinst_LTLIBRARIES = libbus.la -sdk_HEADERS = xf86Pci.h - -PCI_SOURCES = -if XORG_BUS_PCI -PCI_SOURCES += Pci.c Pci.h -endif - -if XORG_BUS_BSDPCI -PCI_SOURCES += bsd_pci.c -endif - -if XORG_BUS_SPARC -PLATFORM_SOURCES = Sbus.c -sdk_HEADERS += xf86Sbus.h -endif - -libbus_la_SOURCES = $(PCI_SOURCES) $(PLATFORM_SOURCES) nobus.c - -AM_CPPFLAGS = $(XORG_INCS) - -AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) - -EXTRA_DIST = $(sdk_HEADERS) diff --git a/hw/xfree86/os-support/hurd/Makefile.am b/hw/xfree86/os-support/hurd/Makefile.am deleted file mode 100644 index 33857f459..000000000 --- a/hw/xfree86/os-support/hurd/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -noinst_LTLIBRARIES = libhurd.la - -libhurd_la_SOURCES = hurd_bell.c hurd_init.c \ - hurd_video.c \ - $(srcdir)/../shared/VTsw_noop.c \ - $(srcdir)/../shared/posix_tty.c \ - $(srcdir)/../shared/vidmem.c \ - $(srcdir)/../shared/sigiostubs.c \ - $(srcdir)/../shared/pm_noop.c \ - $(srcdir)/../shared/kmod_noop.c \ - $(srcdir)/../shared/agp_noop.c - -AM_CFLAGS = -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS) - -AM_CPPFLAGS = $(XORG_INCS) diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am deleted file mode 100644 index 4392fe8d4..000000000 --- a/hw/xfree86/os-support/linux/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -noinst_LTLIBRARIES = liblinux.la - -if LNXACPI -ACPI_SRCS = lnx_acpi.c -if !LNXAPM -ACPI_SRCS += lnx_apm.c -endif -XORG_CFLAGS += -DHAVE_ACPI -endif - -if LNXAPM -APM_SRCS = lnx_apm.c -XORG_CFLAGS += -DHAVE_APM -endif - -if !LNXAPM -if !LNXACPI -ACPI_SRCS = $(srcdir)/../shared/pm_noop.c -endif -endif - -if SYSTEMD_LOGIND -LOGIND_SRCS = systemd-logind.c -XORG_CFLAGS += $(DBUS_CFLAGS) -endif - -if AGP -AGP_SRCS = lnx_agp.c -endif - -liblinux_la_SOURCES = linux.h lnx_init.c lnx_video.c \ - lnx_kmod.c lnx_bell.c lnx_platform.c \ - $(srcdir)/../shared/VTsw_usl.c \ - $(srcdir)/../shared/posix_tty.c \ - $(srcdir)/../shared/vidmem.c \ - $(srcdir)/../shared/sigio.c \ - $(ACPI_SRCS) \ - $(APM_SRCS) \ - $(LOGIND_SRCS) \ - $(AGP_SRCS) - -AM_CFLAGS = -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) - -AM_CPPFLAGS = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) diff --git a/hw/xfree86/os-support/misc/Makefile.am b/hw/xfree86/os-support/misc/Makefile.am deleted file mode 100644 index 0265aecd4..000000000 --- a/hw/xfree86/os-support/misc/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ - -noinst_LTLIBRARIES = libmisc.la - -libmisc_la_SOURCES = SlowBcopy.c - -#AM_LDFLAGS = -r - -AM_CPPFLAGS = $(XORG_INCS) - -AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) - -EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS) diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am deleted file mode 100644 index ae109ff09..000000000 --- a/hw/xfree86/os-support/solaris/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -if SOLARIS_VT -VTSW_SRC = sun_VTsw.c -else -VTSW_SRC = $(srcdir)/../shared/VTsw_noop.c -endif - -if AGP -AGP_SRC = sun_agp.c -else -AGP_SRC = $(srcdir)/../shared/agp_noop.c -endif - -SOLARIS_INOUT_SRC = solaris-@SOLARIS_INOUT_ARCH@.S -DISTCLEANFILES = solaris-@SOLARIS_INOUT_ARCH@.il - -solaris-@SOLARIS_INOUT_ARCH@.il: solaris-@SOLARIS_INOUT_ARCH@.S - $(CPP) -P -DINLINE_ASM $(srcdir)/solaris-@SOLARIS_INOUT_ARCH@.S > $@ - -noinst_LTLIBRARIES = libsolaris.la -libsolaris_la_SOURCES = sun_init.c \ - sun_vid.c sun_bell.c $(AGP_SRC) sun_apm.c \ - $(srcdir)/../shared/kmod_noop.c \ - $(srcdir)/../shared/posix_tty.c \ - $(srcdir)/../shared/sigio.c \ - $(srcdir)/../shared/vidmem.c \ - $(VTSW_SRC) -nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC) - -sdk_HEADERS = -nodist_sdk_HEADERS = solaris-@SOLARIS_INOUT_ARCH@.il - -AM_CFLAGS = -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS) - -AM_CPPFLAGS = $(XORG_INCS) - -EXTRA_DIST = solaris-amd64.S solaris-ia32.S solaris-sparcv8plus.S sun_inout.s diff --git a/hw/xfree86/os-support/stub/Makefile.am b/hw/xfree86/os-support/stub/Makefile.am deleted file mode 100644 index 19468c6de..000000000 --- a/hw/xfree86/os-support/stub/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -noinst_LTLIBRARIES = libstub.la - -AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) - -AM_CPPFLAGS = $(XORG_INCS) - -libstub_la_SOURCES = \ - $(srcdir)/../shared/VTsw_noop.c \ - $(srcdir)/../shared/agp_noop.c \ - $(srcdir)/../shared/ioperm_noop.c \ - $(srcdir)/../shared/kmod_noop.c \ - $(srcdir)/../shared/pm_noop.c \ - $(srcdir)/../shared/vidmem.c \ - $(srcdir)/../shared/posix_tty.c \ - $(srcdir)/../shared/sigio.c \ - stub_bell.c \ - stub_init.c \ - stub_video.c diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am deleted file mode 100644 index 2e4c6afdb..000000000 --- a/hw/xfree86/parser/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -noinst_LTLIBRARIES = libxf86config.la - -INTERNAL_SOURCES= \ - Device.c \ - Files.c \ - Flags.c \ - Input.c \ - InputClass.c \ - OutputClass.c \ - Layout.c \ - Module.c \ - Video.c \ - Monitor.c \ - Pointer.c \ - Screen.c \ - Vendor.c \ - read.c \ - scan.c \ - write.c \ - DRI.c \ - Extensions.c - -libxf86config_la_SOURCES = \ - $(INTERNAL_SOURCES) - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \ - -DDATADIR=\"$(datadir)\" - -EXTRA_DIST = \ - Configint.h \ - configProcs.h \ - xf86Optrec.h \ - xf86Parser.h \ - xf86tokens.h - -sdk_HEADERS = \ - xf86Parser.h \ - xf86Optrec.h - -AM_CPPFLAGS = -I$(srcdir)/../common diff --git a/hw/xfree86/ramdac/Makefile.am b/hw/xfree86/ramdac/Makefile.am deleted file mode 100644 index ffae2c31f..000000000 --- a/hw/xfree86/ramdac/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -noinst_LTLIBRARIES = libramdac.la - -libramdac_la_SOURCES = xf86CursorRD.c xf86HWCurs.c - -sdk_HEADERS = xf86Cursor.h - -EXTRA_DIST = xf86CursorPriv.h CURSOR.NOTES - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -AM_CPPFLAGS = $(XORG_INCS) diff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am deleted file mode 100644 index 67fb2e4cb..000000000 --- a/hw/xfree86/shadowfb/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -module_LTLIBRARIES = libshadowfb.la -libshadowfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -libshadowfb_la_SOURCES = sfbmodule.c shadowfb.c -libshadowfb_la_LIBADD = $(PIXMAN_LIBS) - -sdk_HEADERS = shadowfb.h - -AM_CPPFLAGS = $(XORG_INCS) - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) diff --git a/hw/xfree86/utils/Makefile.am b/hw/xfree86/utils/Makefile.am deleted file mode 100644 index ce83bc3b1..000000000 --- a/hw/xfree86/utils/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = \ - gtf \ - man diff --git a/hw/xfree86/utils/gtf/Makefile.am b/hw/xfree86/utils/gtf/Makefile.am deleted file mode 100644 index f77bf608e..000000000 --- a/hw/xfree86/utils/gtf/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. -# - -bin_PROGRAMS = gtf - -gtf_SOURCES = gtf.c -gtf_CFLAGS = $(XORG_CFLAGS) -gtf_LDADD = -lm diff --git a/hw/xfree86/utils/man/Makefile.am b/hw/xfree86/utils/man/Makefile.am deleted file mode 100644 index 25b3b6a4f..000000000 --- a/hw/xfree86/utils/man/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -include $(top_srcdir)/manpages.am -appman_PRE = gtf.man diff --git a/hw/xfree86/vgahw/Makefile.am b/hw/xfree86/vgahw/Makefile.am deleted file mode 100644 index b8196a695..000000000 --- a/hw/xfree86/vgahw/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -module_LTLIBRARIES = libvgahw.la -libvgahw_la_LDFLAGS = -avoid-version -libvgahw_la_LIBADD = $(PCIACCESS_LIBS) -libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) - -sdk_HEADERS = vgaHW.h diff --git a/hw/xfree86/x86emu/Makefile.am b/hw/xfree86/x86emu/Makefile.am deleted file mode 100644 index 2a55d6353..000000000 --- a/hw/xfree86/x86emu/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -if INT10_X86EMU -noinst_LTLIBRARIES = libx86emu.la -endif - -libx86emu_la_SOURCES = debug.c \ - decode.c \ - fpu.c \ - ops2.c \ - ops.c \ - prim_ops.c \ - sys.c \ - x86emu.h - -AM_CPPFLAGS = - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) - -EXTRA_DIST = validate.c \ - 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/prim_x86_gcc.h \ - x86emu/regs.h \ - x86emu/types.h \ - x86emu/x86emui.h diff --git a/hw/xfree86/xkb/Makefile.am b/hw/xfree86/xkb/Makefile.am deleted file mode 100644 index 252cf3b5d..000000000 --- a/hw/xfree86/xkb/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -noinst_LTLIBRARIES = libxorgxkb.la - -AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ -AM_CPPFLAGS = @XORG_INCS@ - -libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c |