diff options
Diffstat (limited to 'hw/xfree86')
27 files changed, 74 insertions, 33 deletions
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 1f48cb02d..b45a8685f 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -32,5 +32,3 @@ Xorg_LDADD = $(XORG_LIBS) \ -ldl Xorg_LDFLAGS = -rdynamic - -sdk_HEADERS = xf86Date.h xf86Version.h xorgVersion.h diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am index 34b6cc384..e67d14dd3 100644 --- a/hw/xfree86/common/Makefile.am +++ b/hw/xfree86/common/Makefile.am @@ -44,9 +44,9 @@ libcommon_a_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \ xf86Cursor.c xf86DGA.c xf86DPMS.c xf86DefModes.c \ xf86DoProbe.c xf86DoScanPci.c xf86Events.c \ xf86Globals.c xf86Io.c xf86AutoConfig.c \ - xf86MiscExt.c xf86Option.c xf86PM.c \ + xf86MiscExt.c xf86Option.c \ xf86VidMode.c xf86fbman.c xf86cmap.c \ - ../scanpci/xf86ScanPci.c xf86Helper.c \ + xf86Helper.c \ xf86Mode.c xf86Build.h xorgHelper.c xf86Versions.c \ $(XVSOURCES) $(BUSSOURCES) $(XKBSOURCES) \ $(DEBUGSOURCES) $(XISOURCES) $(RANDRSOURCES) \ @@ -92,6 +92,9 @@ EXTRA_DIST = \ xf86xvmc.h \ xf86xvpriv.h \ xisb.h \ - xf86Build.h.in + xf86Build.h.in \ + xf86Version.h \ + xorgVersion.h \ + xf86Date.h AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/ddc/Makefile.am b/hw/xfree86/ddc/Makefile.am index 1000cd527..d4d85d2ad 100644 --- a/hw/xfree86/ddc/Makefile.am +++ b/hw/xfree86/ddc/Makefile.am @@ -6,4 +6,6 @@ libddc_la_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \ INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c +AM_CFLAGS = $(XORG_CFLAGS) + EXTRA_DIST = ddcPriv.h diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index 361b71a79..0810c6b00 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libdixmods.la module_LTLIBRARIES = libbitmap.la libfb.la # yes, this is a cheesy hack. -AM_CFLAGS = -include xorg-config.h $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) -include xorg-config.h INCLUDES = $(XORG_INCS) -I$(top_srcdir)/afb -I$(top_srcdir)/mfb \ -I$(top_srcdir)/cfb -I$(top_srcdir)/dbe -I$(srcdir)/../loader \ -I$(top_srcdir)/miext/layer -I$(top_srcdir)/miext/shadow @@ -32,7 +32,7 @@ libdixmods_la_SOURCES = \ $(top_srcdir)/Xext/xf86misc.c \ $(top_srcdir)/Xext/xf86vmode.c -xkb%.c: $(srcdir)/ddx$*.c +xkb%.c: echo "#define XF86DDXACTIONS" > $@ echo "#include \"$(top_srcdir)/xkb/ddx$*.c\"" >> $@ diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am index d96407d01..0938eec49 100644 --- a/hw/xfree86/dummylib/Makefile.am +++ b/hw/xfree86/dummylib/Makefile.am @@ -2,6 +2,8 @@ noinst_LIBRARIES = libdummy.a INCLUDES = $(XORG_INCS) +AM_CFLAGS = $(XORG_CFLAGS) + libdummy_a_SOURCES = getvalidbios.c \ pcitestmulti.c xf86allocscripi.c \ xf86addrestolist.c xf86drvmsg.c xf86drvmsgverb.c \ diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am index 722ea35b0..a3283290c 100644 --- a/hw/xfree86/fbdevhw/Makefile.am +++ b/hw/xfree86/fbdevhw/Makefile.am @@ -8,6 +8,8 @@ libfbdevhw_la_SOURCES = fbdevhw.c INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c +AM_CFLAGS = $(XORG_CFLAGS) + sdk_HEADERS = fbdevhw.h EXTRA_DIST = fbpriv.h diff --git a/hw/xfree86/i2c/Makefile.am b/hw/xfree86/i2c/Makefile.am index 1b29aec01..cd244a1c6 100644 --- a/hw/xfree86/i2c/Makefile.am +++ b/hw/xfree86/i2c/Makefile.am @@ -4,4 +4,6 @@ libi2c_la_SOURCES = xf86i2c.c xf86i2cmodule.c INCLUDES = $(XORG_INCS) +AM_CFLAGS = $(XORG_CFLAGS) + sdk_HEADERS = xf86i2c.h diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am index 99fd30731..b0ff56f9f 100644 --- a/hw/xfree86/int10/Makefile.am +++ b/hw/xfree86/int10/Makefile.am @@ -23,7 +23,7 @@ libint10_la_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \ endif if INT10_STUB -AM_CFLAGS = -D_PC -D_VM86_LINUX +AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) libint10_la_SOURCES = stub.c xf86int10module.c endif diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am index 948ee4ed8..832d46a0b 100644 --- a/hw/xfree86/loader/Makefile.am +++ b/hw/xfree86/loader/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \ -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac -I$(srcdir)/../shadowfb #AM_LDFLAGS = -r -AM_CFLAGS = -DIN_LOADER +AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) EXTRA_DIST = \ aout.h \ diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am index 4e9d7861b..020554512 100644 --- a/hw/xfree86/os-support/bus/Makefile.am +++ b/hw/xfree86/os-support/bus/Makefile.am @@ -11,6 +11,8 @@ endif INCLUDES = $(XORG_INCS) +AM_CFLAGS = $(XORG_CFLAGS) + EXTRA_DIST = \ 460gxPCI.h \ Pci.h \ diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am index 0dac944b9..eca77f123 100644 --- a/hw/xfree86/os-support/linux/Makefile.am +++ b/hw/xfree86/os-support/linux/Makefile.am @@ -5,18 +5,20 @@ endif noinst_LIBRARIES = liblinux.a liblinux_a_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \ - lnx_pci.c lnx_apm.c lnx_agp.c lnx_kmod.c lnx_KbdMap.c \ - ../shared/bios_mmap.c ../shared/VTsw_usl.c \ - ../shared/std_kbdEv.c ../shared/posix_tty.c \ - ../shared/vidmem.c ../shared/sigio.c \ - ../shared/stdResource.c ../shared/libc_wrapper.c \ - ../shared/at_scancode.c -#libxorglinux_a_LIBADD = int10/libxorglinuxint10.a \ -# $(DRI_LIBS) + lnx_pci.c lnx_agp.c lnx_kmod.c lnx_KbdMap.c \ + $(srcdir)/../shared/bios_mmap.c \ + $(srcdir)/../shared/VTsw_usl.c \ + $(srcdir)/../shared/std_kbdEv.c \ + $(srcdir)/../shared/posix_tty.c \ + $(srcdir)/../shared/vidmem.c \ + $(srcdir)/../shared/sigio.c \ + $(srcdir)/../shared/stdResource.c \ + $(srcdir)/../shared/libc_wrapper.c \ + $(srcdir)/../shared/at_scancode.c sdk_HEADERS = agpgart.h -AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC +AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) SUBDIRS = $(DRI_SUBDIRS) diff --git a/hw/xfree86/os-support/linux/drm/Makefile.am b/hw/xfree86/os-support/linux/drm/Makefile.am index 6f2258f19..0be0ccba3 100644 --- a/hw/xfree86/os-support/linux/drm/Makefile.am +++ b/hw/xfree86/os-support/linux/drm/Makefile.am @@ -1,8 +1,8 @@ INCLUDES = -I$(srcdir)/../../shared/drm/kernel -noinst_LIBRARIES = libxorglinuxdrm.a +sdklibdir = $(libdir)/xorg +sdklib_LIBRARIES = libxorglinuxdrm.a libxorglinuxdrm_a_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c \ - xf86drmSL.c drmmodule.c + xf86drmSL.c drmmodule.c -sdk_LIBDIR = $(libdir)/xorg -sdk_LIBS = libxorglinuxdrm.a +AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/os-support/linux/int10/Makefile.am b/hw/xfree86/os-support/linux/int10/Makefile.am index 598b09e15..d944053ec 100644 --- a/hw/xfree86/os-support/linux/int10/Makefile.am +++ b/hw/xfree86/os-support/linux/int10/Makefile.am @@ -1,5 +1,7 @@ INCLUDES = -I$(srcdir)/../../../int10 +AM_CFLAGS = $(XORG_CFLAGS) + noinst_LIBRARIES = libxorglinuxint10.a libxorglinuxint10_a_SOURCES = linux.c ../../../int10/helper_mem.c \ ../../../int10/pci.c \ diff --git a/hw/xfree86/os-support/misc/Makefile.am b/hw/xfree86/os-support/misc/Makefile.am index 11d253479..a401320d6 100644 --- a/hw/xfree86/os-support/misc/Makefile.am +++ b/hw/xfree86/os-support/misc/Makefile.am @@ -2,6 +2,8 @@ noinst_LIBRARIES = libmisc.a libmisc_a_SOURCES = Delay.c IODelay.c BUSmemcpy.c SlowBcopy.c -AM_LDFLAGS = -r +#AM_LDFLAGS = -r INCLUDES = $(XORG_INCS) + +AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am index 812df92df..5dfa33dd0 100644 --- a/hw/xfree86/parser/Makefile.am +++ b/hw/xfree86/parser/Makefile.am @@ -3,6 +3,8 @@ libparser_a_SOURCES = Device.c Files.c Flags.c Input.c Keyboard.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 +AM_CFLAGS = $(XORG_CFLAGS) + EXTRA_DIST = \ Configint.h \ configProcs.h \ diff --git a/hw/xfree86/rac/Makefile.am b/hw/xfree86/rac/Makefile.am index 2d02a81c2..a4a751cd0 100644 --- a/hw/xfree86/rac/Makefile.am +++ b/hw/xfree86/rac/Makefile.am @@ -4,3 +4,5 @@ librac_la_SOURCES = xf86RACmodule.c xf86RAC.c sdk_HEADERS = xf86RAC.h INCLUDES = $(XORG_INCS) + +AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/ramdac/Makefile.am b/hw/xfree86/ramdac/Makefile.am index e9edef244..9833431de 100644 --- a/hw/xfree86/ramdac/Makefile.am +++ b/hw/xfree86/ramdac/Makefile.am @@ -8,7 +8,8 @@ sdk_HEADERS = BT.h IBM.h TI.h xf86Cursor.h xf86RamDac.h DISTCLEANFILES = xf86BitOrder.c EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h -AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE +AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \ + $(XORG_CFLAGS) INCLUDES = $(XORG_INCS) xf86BitOrder.c: diff --git a/hw/xfree86/scanpci/Makefile.am b/hw/xfree86/scanpci/Makefile.am index f52d91b61..78aaffdd2 100644 --- a/hw/xfree86/scanpci/Makefile.am +++ b/hw/xfree86/scanpci/Makefile.am @@ -5,6 +5,10 @@ libscanpci_la_SOURCES = xf86ScanPci.c INCLUDES = $(XORG_INCS) +AM_CFLAGS = $(XORG_CFLAGS) + +BUILT_SOURCES = xf86PciIds.h + EXTRA_DIST = \ xf86PciData.h \ xf86PciIds.h \ @@ -16,4 +20,7 @@ xf86PciData.c: echo "#define PCIDATA" > $@ echo "#include \"$(srcdir)/xf86ScanPci.c\"" >> $@ -DISTCLEANFILES = xf86PciData.c +xf86PciIds.h: $(srcdir)/../common/xf86PciInfo.h + $(PERL) $(srcdir)/pciid2c.pl $(srcdir)/../common/xf86PciInfo.h < $(srcdir)/pci.ids > xf86PciIds.h + +DISTCLEANFILES = xf86PciData.c xf86PciIds.h diff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am index d8e2e1dc9..8316eb660 100644 --- a/hw/xfree86/shadowfb/Makefile.am +++ b/hw/xfree86/shadowfb/Makefile.am @@ -4,3 +4,5 @@ libshadowfb_la_SOURCES = sfbmodule.c shadow.c sdk_HEADERS = shadowfb.h INCLUDES = $(XORG_INCS) + +AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am index 91d4a9129..c27541ae6 100644 --- a/hw/xfree86/vbe/Makefile.am +++ b/hw/xfree86/vbe/Makefile.am @@ -3,5 +3,7 @@ libvbe_la_SOURCES = vbe.c vbeModes.c vbe_module.c sdk_HEADERS = vbe.h vbeModes.h +AM_CFLAGS = $(XORG_CFLAGS) + INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \ -I$(srcdir)/../int10 diff --git a/hw/xfree86/vgahw/Makefile.am b/hw/xfree86/vgahw/Makefile.am index cffcea32f..5e8c41f49 100644 --- a/hw/xfree86/vgahw/Makefile.am +++ b/hw/xfree86/vgahw/Makefile.am @@ -1,5 +1,6 @@ module_LTLIBRARIES = libvgahw.la libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c +AM_CFLAGS = $(XORG_CFLAGS) sdk_HEADERS = vgaHW.h diff --git a/hw/xfree86/xaa/Makefile.am b/hw/xfree86/xaa/Makefile.am index eeebf924e..36e2adae7 100644 --- a/hw/xfree86/xaa/Makefile.am +++ b/hw/xfree86/xaa/Makefile.am @@ -61,3 +61,5 @@ EXTRA_DIST = xaaWrapper.h xaacexp.h xaawrap.h xaaLine.c xaaDashLine.c \ xaaStipple.c xaaTEGlyph.c xaaBitmap.c INCLUDES = $(XORG_INCS) + +AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/xf1bpp/Makefile.am b/hw/xfree86/xf1bpp/Makefile.am index 79275ee55..0758e6709 100644 --- a/hw/xfree86/xf1bpp/Makefile.am +++ b/hw/xfree86/xf1bpp/Makefile.am @@ -58,7 +58,7 @@ libxf1bppmfb_a_SOURCES = \ libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES) -AM_CFLAGS = -DXF86MONO -include mfbmap.h +AM_CFLAGS = -DXF86MONO -include mfbmap.h $(XORG_CFLAGS) INCLUDES = $(XORG_INCS) mfbseg.c: diff --git a/hw/xfree86/xf4bpp/Makefile.am b/hw/xfree86/xf4bpp/Makefile.am index c1b24d3de..2dfc20b8c 100644 --- a/hw/xfree86/xf4bpp/Makefile.am +++ b/hw/xfree86/xf4bpp/Makefile.am @@ -43,8 +43,8 @@ libxf4bpp_la_SOURCES = \ mfbfillarc.c \ mfbzerarc.c \ vgamodule.c - -libxf4bpp_la_LIBADD=../xf1bpp/libxf1bpp.la + +libxf4bpp_la_LIBADD = ../xf1bpp/libxf1bpp.la EXTRA_DIST = OScompiler.h ibmTrace.h ppcGCstr.h ppcSpMcro.h vgaReg.h \ vgaVideo.h wm3.h @@ -55,5 +55,6 @@ mfbseg.c: echo "#define POLYSEGMENT" > $@ echo "#include \"$(top_srcdir)/mfb/mfbline.c\"" >> $@ -INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb \ - -I$(top_srcdir)/cfb +INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp + +AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/xf8_16bpp/Makefile.am b/hw/xfree86/xf8_16bpp/Makefile.am index b584362a7..1ead8f1bd 100644 --- a/hw/xfree86/xf8_16bpp/Makefile.am +++ b/hw/xfree86/xf8_16bpp/Makefile.am @@ -2,7 +2,9 @@ module_LTLIBRARIES = libxf8_16bpp.la sdk_HEADERS = cfb8_16.h -INCLUDES = $(XORG_INCS) -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb +INCLUDES = $(XORG_INCS) + +AM_CFLAGS = $(XORG_CFLAGS) libxf8_16bpp_la_SOURCES = \ cfb8_16module.c \ diff --git a/hw/xfree86/xf8_32bpp/Makefile.am b/hw/xfree86/xf8_32bpp/Makefile.am index b9afbe557..f96fb6b19 100644 --- a/hw/xfree86/xf8_32bpp/Makefile.am +++ b/hw/xfree86/xf8_32bpp/Makefile.am @@ -2,7 +2,8 @@ module_LTLIBRARIES = libxf8_32bpp.la sdk_HEADERS = cfb8_32.h -INCLUDES = -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb +INCLUDES = $(XORG_INCS) +AM_CFLAGS = $(XORG_CFLAGS) libxf8_32bpp_la_SOURCES = \ cfbbstore.c \ diff --git a/hw/xfree86/xf8_32wid/Makefile.am b/hw/xfree86/xf8_32wid/Makefile.am index 1d1227189..0e1860e5d 100644 --- a/hw/xfree86/xf8_32wid/Makefile.am +++ b/hw/xfree86/xf8_32wid/Makefile.am @@ -2,7 +2,8 @@ module_LTLIBRARIES = libxf8_32wid.la sdk_HEADERS = cfb8_32wid.h -INCLUDES = $(XORG_INCS) -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb +INCLUDES = $(XORG_INCS) +AM_CFLAGS = $(XORG_CFLAGS) libxf8_32wid_la_SOURCES = \ cfb8_32widmodule.c \ |