2006-05-09 20:04:29 +02:00
|
|
|
noinst_LTLIBRARIES = libcommon.la
|
2005-07-01 22:29:53 +02:00
|
|
|
|
2010-06-01 12:05:47 +02:00
|
|
|
if XORG_BUS_PCI
|
|
|
|
|
PCI_SOURCES = xf86pciBus.c xf86VGAarbiter.c xf86VGAarbiter.h \
|
|
|
|
|
xf86VGAarbiterPriv.h
|
|
|
|
|
endif
|
|
|
|
|
|
2005-08-21 21:15:11 +02:00
|
|
|
if XORG_BUS_SPARC
|
2005-07-01 22:29:53 +02:00
|
|
|
SBUS_SOURCES = xf86sbusBus.c
|
|
|
|
|
endif
|
|
|
|
|
|
2005-08-21 21:15:11 +02:00
|
|
|
if XV
|
2005-07-01 22:29:53 +02:00
|
|
|
XVSOURCES = xf86xv.c xf86xvmc.c
|
Use libtool convenience libraries and better "symbol" table.
All .a libraries were converted to .la, and instead of linking the
Xorg binary with a mix of .a and .la, and adding some libraries more
then once in the command line, etc, now it generates a single libxorg.la
from all the required convenience libraries, and links with a dummy
xorg.c (that should usually be the file with the main function...).
This removes the requirement of some things like libosandcommon and
libinit, that existed to circumvent problems when linking multiple
.a and .la in the final Xorg binary.
The "symbol table" is now generated dynamically, by a shell script,
with an embedded gawk parser that parses cpp output. The new file
sdksyms.sh is generated by hand by analyzing all Makefile.am's and
making it create a sdksyms.c file, that includes all sdk headers that
will add symbols for the Xorg binary. Module headers aren't read, and
a in 2 files it was required to add a "<hash>ifndef XorgLoader" around
declarations shared between the Xorg binary and libextmod. A few
other changes were added to other sdk headers, like preventing
multiple inclusion, or including other headers to satisfy dependencies.
This should be a lot more portable, and better (hopefully properly)
using libtool to generate convenience libraries.
2008-12-07 05:22:19 +01:00
|
|
|
XVSDKINCS = xf86xv.h xf86xvmc.h xf86xvpriv.h
|
2005-08-21 21:15:11 +02:00
|
|
|
endif
|
2005-07-01 22:29:53 +02:00
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
if XF86VIDMODE
|
2012-09-06 14:51:38 +02:00
|
|
|
XF86VMODESOURCES = xf86vmode.c
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
XF86VMODE_SDK = vidmodeproc.h
|
|
|
|
|
endif
|
|
|
|
|
|
2009-01-05 10:23:39 +01:00
|
|
|
if DGA
|
|
|
|
|
DGASOURCES = xf86DGA.c
|
2012-07-10 03:03:10 +02:00
|
|
|
DGA_SDK = dgaproc.h
|
2009-01-05 10:23:39 +01:00
|
|
|
endif
|
|
|
|
|
|
xfree86: use udev to provide device enumeration for kms devices (v10)
On Linux in order for future hotplug work, we are required to interface
to udev to detect device creation/removal. In order to try and get
some earlier testing on this, this patch adds the ability to use
udev for device enumeration on Linux.
At startup the list of drm/kms devices is probed and this info is
used to load drivers.
A new driver probing method is introduced that passes the udev
device info to the driver for probing.
The probing integrates with the pci probing code and will fallback
to the pci probe and old school probe functions in turn.
The flags parameter to the probe function will be used later
to provide hotplug and gpu screen flags for the driver to behave
in a different way.
This patch changes the driver ABI, all drivers should at least
be set with a NULL udev probe function after this commit.
v2: rename to platform bus, now with 100% less udev specific,
this version passes config_odev_attribs around which are an array
of id/string pairs, then the udev code can attach the set of attribs
it understands, the OS specific code can attach its attrib, and then
the core/drivers can lookup the required attribs.
also add MATCH_PCI_DEVICES macro.
This version is mainly to address concerns raised by ajax.
v3: Address comments from Peter.
fix whitespace that snuck in.
rework to use a linked list with some core functions that
xf86 wraps.
v4: add free list, fix struct whitespace.
ajax this address most of your issues?
v5: drop probe ifdef, fix logic issue
v6: some overhaul after more testing.
Implement primaryBus for platform devices.
document hotplug.h dev attribs - drop sysname attrib
fix build with udev kms disabled
make probing work like the PCI probe code,
match against bus id if one exists, or primary device.
RFC: add new bus id support "PLAT:syspath". we probably
want to match on this a bit different, or use a different
property maybe. I was mainly wanting this for use with
specifying usb devices in xorg.conf directly, but PLAT:path
could also work I suppose.
v6.1: add missing noop platform function
v7: fix two interactions with pci probing and slot claiming, prevents
pci and platform trying to load two drivers for same slot.
v8: test with zaphod mode on -ati driver, fixup resulting issue
clean up common probe code into another function, change busid
matching to allow dropping end of strings.
v9: fix platform probing logic so it actually works.
v9.1: fix pdev init to NULL properly.
v10: address most of Keith's concerns.
v4 was thanks to Reviewed-by: Adam Jackson <ajax@redhat.com>
v5 was Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-05-08 15:26:47 +02:00
|
|
|
if XORG_BUS_PLATFORM
|
|
|
|
|
PLATSOURCES = xf86platformBus.c
|
|
|
|
|
endif
|
|
|
|
|
|
2005-07-01 22:29:53 +02:00
|
|
|
RANDRSOURCES = xf86RandR.c
|
|
|
|
|
|
xfree86: use udev to provide device enumeration for kms devices (v10)
On Linux in order for future hotplug work, we are required to interface
to udev to detect device creation/removal. In order to try and get
some earlier testing on this, this patch adds the ability to use
udev for device enumeration on Linux.
At startup the list of drm/kms devices is probed and this info is
used to load drivers.
A new driver probing method is introduced that passes the udev
device info to the driver for probing.
The probing integrates with the pci probing code and will fallback
to the pci probe and old school probe functions in turn.
The flags parameter to the probe function will be used later
to provide hotplug and gpu screen flags for the driver to behave
in a different way.
This patch changes the driver ABI, all drivers should at least
be set with a NULL udev probe function after this commit.
v2: rename to platform bus, now with 100% less udev specific,
this version passes config_odev_attribs around which are an array
of id/string pairs, then the udev code can attach the set of attribs
it understands, the OS specific code can attach its attrib, and then
the core/drivers can lookup the required attribs.
also add MATCH_PCI_DEVICES macro.
This version is mainly to address concerns raised by ajax.
v3: Address comments from Peter.
fix whitespace that snuck in.
rework to use a linked list with some core functions that
xf86 wraps.
v4: add free list, fix struct whitespace.
ajax this address most of your issues?
v5: drop probe ifdef, fix logic issue
v6: some overhaul after more testing.
Implement primaryBus for platform devices.
document hotplug.h dev attribs - drop sysname attrib
fix build with udev kms disabled
make probing work like the PCI probe code,
match against bus id if one exists, or primary device.
RFC: add new bus id support "PLAT:syspath". we probably
want to match on this a bit different, or use a different
property maybe. I was mainly wanting this for use with
specifying usb devices in xorg.conf directly, but PLAT:path
could also work I suppose.
v6.1: add missing noop platform function
v7: fix two interactions with pci probing and slot claiming, prevents
pci and platform trying to load two drivers for same slot.
v8: test with zaphod mode on -ati driver, fixup resulting issue
clean up common probe code into another function, change busid
matching to allow dropping end of strings.
v9: fix platform probing logic so it actually works.
v9.1: fix pdev init to NULL properly.
v10: address most of Keith's concerns.
v4 was thanks to Reviewed-by: Adam Jackson <ajax@redhat.com>
v5 was Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-05-08 15:26:47 +02:00
|
|
|
BUSSOURCES = xf86fbBus.c xf86noBus.c $(PCI_SOURCES) $(SBUS_SOURCES) $(PLATSOURCES)
|
2005-07-01 22:29:53 +02:00
|
|
|
|
2005-09-26 22:58:26 +02:00
|
|
|
MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes
|
|
|
|
|
|
2007-12-03 22:57:58 +01:00
|
|
|
xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES)
|
2010-11-11 18:36:45 +01:00
|
|
|
$(AM_V_GEN)cat $(MODEDEFSOURCES) | LC_ALL=C $(AWK) -f $(srcdir)/modeline2c.awk > $@
|
|
|
|
|
$(AM_V_GEN)echo >> $@
|
2005-09-26 22:58:26 +02:00
|
|
|
|
|
|
|
|
BUILT_SOURCES = xf86DefModeSet.c
|
|
|
|
|
|
2005-07-01 22:29:53 +02:00
|
|
|
AM_LDFLAGS = -r
|
2011-11-04 06:13:05 +01:00
|
|
|
libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
|
2009-03-04 16:23:10 +01:00
|
|
|
xf86Cursor.c $(DGASOURCES) xf86DPMS.c \
|
2008-11-25 06:38:47 +01:00
|
|
|
xf86Events.c xf86Globals.c xf86AutoConfig.c \
|
2010-06-01 12:05:47 +02:00
|
|
|
xf86Option.c xf86Init.c \
|
2005-07-01 22:29:53 +02:00
|
|
|
xf86VidMode.c xf86fbman.c xf86cmap.c \
|
2009-07-28 06:47:42 +02:00
|
|
|
xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \
|
2012-07-10 03:02:56 +02:00
|
|
|
xf86Mode.c xorgHelper.c xf86Extensions.h \
|
2012-09-06 14:51:38 +02:00
|
|
|
xf86Extensions.c $(XF86VMODESOURCES) \
|
2008-07-16 00:43:58 +02:00
|
|
|
$(XVSOURCES) $(BUSSOURCES) $(RANDRSOURCES)
|
Use libtool convenience libraries and better "symbol" table.
All .a libraries were converted to .la, and instead of linking the
Xorg binary with a mix of .a and .la, and adding some libraries more
then once in the command line, etc, now it generates a single libxorg.la
from all the required convenience libraries, and links with a dummy
xorg.c (that should usually be the file with the main function...).
This removes the requirement of some things like libosandcommon and
libinit, that existed to circumvent problems when linking multiple
.a and .la in the final Xorg binary.
The "symbol table" is now generated dynamically, by a shell script,
with an embedded gawk parser that parses cpp output. The new file
sdksyms.sh is generated by hand by analyzing all Makefile.am's and
making it create a sdksyms.c file, that includes all sdk headers that
will add symbols for the Xorg binary. Module headers aren't read, and
a in 2 files it was required to add a "<hash>ifndef XorgLoader" around
declarations shared between the Xorg binary and libextmod. A few
other changes were added to other sdk headers, like preventing
multiple inclusion, or including other headers to satisfy dependencies.
This should be a lot more portable, and better (hopefully properly)
using libtool to generate convenience libraries.
2008-12-07 05:22:19 +01:00
|
|
|
nodist_libcommon_la_SOURCES = xf86DefModeSet.c xf86Build.h
|
2010-05-16 21:29:02 +02:00
|
|
|
libcommon_la_LIBADD = $(top_builddir)/config/libconfig.la
|
2005-07-01 22:29:53 +02:00
|
|
|
|
2013-08-06 05:08:13 +02:00
|
|
|
AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
|
2009-07-28 06:47:42 +02:00
|
|
|
-I$(srcdir)/../loader -I$(srcdir)/../parser \
|
2006-06-07 23:09:02 +02:00
|
|
|
-I$(srcdir)/../vbe -I$(srcdir)/../int10 \
|
2008-07-21 22:39:43 +02:00
|
|
|
-I$(srcdir)/../vgahw -I$(srcdir)/../dixmods/extmod \
|
2012-07-10 03:03:18 +02:00
|
|
|
-I$(srcdir)/../modes -I$(srcdir)/../ramdac -I$(srcdir)/../dri2
|
2005-07-01 22:29:53 +02:00
|
|
|
|
|
|
|
|
sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
|
2009-07-28 06:47:42 +02:00
|
|
|
xf86PciInfo.h xf86Priv.h xf86Privstr.h \
|
|
|
|
|
xf86cmap.h xf86fbman.h xf86str.h xf86Xinput.h xisb.h \
|
2012-07-10 03:03:10 +02:00
|
|
|
$(XVSDKINCS) $(XF86VMODE_SDK) $(DGA_SDK) xorgVersion.h \
|
2012-07-09 21:04:15 +02:00
|
|
|
xf86sbusBus.h xf86VGAarbiter.h xf86Optionstr.h xf86platformBus.h \
|
|
|
|
|
xaarop.h
|
2005-07-01 22:29:53 +02:00
|
|
|
|
2005-10-12 13:15:44 +02:00
|
|
|
DISTCLEANFILES = xf86Build.h
|
|
|
|
|
CLEANFILES = $(BUILT_SOURCES)
|
2005-07-01 22:29:53 +02:00
|
|
|
|
|
|
|
|
EXTRA_DIST = \
|
|
|
|
|
compiler.h \
|
|
|
|
|
fourcc.h \
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
vidmodeproc.h \
|
2005-07-01 22:29:53 +02:00
|
|
|
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 \
|
2005-07-02 20:59:44 +02:00
|
|
|
xorgVersion.h \
|
2005-09-26 22:58:26 +02:00
|
|
|
$(MODEDEFSOURCES) \
|
2007-12-12 21:20:54 +01:00
|
|
|
modeline2c.awk \
|
2009-08-28 03:39:42 +02:00
|
|
|
xf86VGAarbiter.h \
|
|
|
|
|
xf86VGAarbiterPriv.h \
|
2012-07-09 21:04:15 +02:00
|
|
|
$(DISTKBDSOURCES) \
|
|
|
|
|
xaarop.h
|
2005-07-01 22:29:53 +02:00
|
|
|
|
2006-05-09 20:04:29 +02:00
|
|
|
if LNXACPI
|
|
|
|
|
XORG_CFLAGS += -DHAVE_ACPI
|
|
|
|
|
endif
|
|
|
|
|
|
2014-10-31 00:24:50 +01:00
|
|
|
if NEED_DBUS
|
|
|
|
|
XORG_CFLAGS += $(DBUS_CFLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
2006-09-18 21:11:18 +02:00
|
|
|
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
|
