Commit Graph

41 Commits

Author SHA1 Message Date
Olivier Fourdan 3cdac5ba07 mi: List extensions in usage message
Not all extensions can be enabled or disabled at runtime, list the
extensions which can from the help message rather than on error only.

v2:
 * Print the header message in the ListStaticExtensions() (Peter
   Hutterer)
 * Do not export ListStaticExtensions() as Xserver API

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
2021-01-29 12:52:09 +00:00
Jon Turney 7d0728d6c4 Revert "dmx: fix linking"
Since commit 3ef16dfb98, "dmx: fix
linking", linking dmx is broken for me:

  CCLD     Xdmx.exe
../../render/.libs/librender.a(glyph.o): In function `HashGlyph':
/wip/xserver/build.x86_64/../render/glyph.c:168: undefined reference to `x_sha1_init'
/wip/xserver/build.x86_64/../render/glyph.c:174: undefined reference to `x_sha1_update'
/wip/xserver/build.x86_64/../render/glyph.c:177: undefined reference to `x_sha1_update'
/wip/xserver/build.x86_64/../render/glyph.c:180: undefined reference to `x_sha1_final'
../../render/.libs/librender.a(mipict.o): In function `miClipPictureReg':
/wip/xserver/build.x86_64/../render/mipict.c:233: undefined reference to `pixman_region_n_rects'
/wip/xserver/build.x86_64/../render/mipict.c:234: undefined reference to `pixman_region_n_rects'
/wip/xserver/build.x86_64/../render/mipict.c:235: undefined reference to `pixman_region_rectangles'
/wip/xserver/build.x86_64/../render/mipict.c:236: undefined reference to `pixman_region_rectangles'
/wip/xserver/build.x86_64/../render/mipict.c:248: undefined reference to `pixman_region_init'
/wip/xserver/build.x86_64/../render/mipict.c:251: undefined reference to `pixman_region_not_empty'
/wip/xserver/build.x86_64/../render/mipict.c:261: undefined reference to `pixman_region_not_empty'
../../render/.libs/librender.a(mipict.o): In function `miComputeCompositeRegion':
/wip/xserver/build.x86_64/../render/mipict.c:340: undefined reference to `pixman_region_init'

The change this was fixing appears to be effectively reverted by
542d9f6807, so just revert commit
3ef16dfb98.

Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
2017-09-18 13:00:54 -04:00
Mihail Konev 3ef16dfb98 dmx: fix linking
Reviewed-by: Adam Jackson <ajax@redhat.com>
2017-02-08 12:03:08 -05:00
Jon TURNEY 432fc37e2c Build fbcmap_mi.c once, rather than once for each DDX
Build fbcmap_mi.c once, rather than once for each DDX, and make it part of libfb
or libwfb convenience library.

Since 84e8de1271 we don't have fbcmap.c

This is a sort of revert of 17d85387d1

v2: Remove libkdrivestubs.la from configure.ac

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2014-03-27 14:34:06 +00:00
Adam Jackson e674815e0a dmx: Remove ShadowFB support
This has been listed as deprecated ever since DMX was merged.

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10 13:28:23 -04:00
Gaetan Nadon 622ebb8815 dmx: split DocBook/XML and Doxygen makefile targets
Maintaining either requires full knowledge of both.
It's not obvious one has to check the usage of global variables
in devbook.am when maintaining doxygen target. Or vice-versa.

Being in their respective directory, one less thing to worry about.

Reviewed-by Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-05-13 14:08:05 -07:00
Gaetan Nadon c86f7c2b8e Xdmx: build all man pages using XORG_MANPAGE_SECTIONS
Use standard directory and makefile.

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-01-18 15:11:06 -08:00
Gaetan Nadon 03ea0b7726 docs: replace BUILLDOCS with existing ENABLE_DEVEL_DOCS
Use the util-macros AM Conditionals to control generation of developers
documents. This is used throughout xorg modules.

The doxygen generated docs are now also managed by --enable-devel-docs.

Remove --enable-builddocs as this was last use for BUILDDOCS

	*** From the RELEASE NOTES ***

 New configure options for documentation in modules
 --------------------------------------------------
 As many more modules now contain documentation to be converted from DocBook XML to text,
 HTML, PostScript, and/or PDF formats, new standard options have been added to the configure
 macros to control the build of these in the modules.
 --with-xmlto=yes|no
                     Enables or disables use of the xmlto [https://fedorahosted.org/
                     xmlto/] command to translate DocBook XML to other formats.
                     All DocBook XML conversions require use of this command.
 --with-fop=yes|no
                     Enables or disables use of the Apache fop [http://
                     xmlgraphics.apache.org/fop/] command to translate DocBook
                     XML to PostScript and PDF formats.
 --enable-docs=yes|no
                     Enables or disables the build and installation of all
                     documentation except traditional man pages or those covered
                     by the --enable-devel-docs and --enable-specs options.
 --enable-devel-docs=yes|no
                     Enables or disables the build and installation of documentation
                     for developers of the X.Org software modules.
 --enable-specs=yes|no
                     Enables or disables the build and installation of the formal
                     specification documents for protocols and APIs.

Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
2010-12-14 14:55:08 -08:00
Gaetan Nadon c78c71c3a8 hw/dmx/doc: DIST_SUBDIRS not required when using AM_CONDITIONAL
The makefile can be simplyfied as Automake handle this automatically.
All directories in SUBDIRS are visited for dist purposes.

www.gnu.org/software/automake/manual/automake.html#SUBDIRS-vs-DIST_005fSUBDIRS

Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
2010-12-14 14:51:51 -08:00
Cyril Brulebois 780754050b Fix GLX_LIBS vs. DMX_LIBS order.
If glxproxy needs symbols which aren't pulled in by dmx itself, glxproxy
fails to link because of undefined references.

Signed-off-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
2010-12-07 09:24:16 -08:00
Yaakov Selkowitz 0820a6e2fb Fix .man.N targets for AM_SILENT_RULES
Add $(AM_V_GEN) for sed-based rules so they appear as expected with
automake silent rules, and $(AM_V_at) to completely hide cp/ln/rm
commands which are not prone to fail.

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-03-22 00:45:55 -05:00
Yaakov Selkowitz 9be4157391 Respect value of SED from configure
We now use libtool, which calls AC_PROG_SED and sets SED as the path to
a fully-functional 'sed' (which may also be called 'gsed' if GNU sed is
installed alongside a proprietary version).  Therefore we should respect
the value of SED so we are sure to use the correct one.

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-03-22 00:45:54 -05:00
Yaakov Selkowitz 5e00f464c5 Fix relink targets for silent rules
Add $(AM_V_at) to all relink make targets to silence them when automake
silent rules are in use.

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-03-22 00:45:52 -05:00
Yaakov Selkowitz fa7e062962 Use EXEEXT in relink rules for portable DDXs
On Cygwin and MinGW, executables use the .exe suffix.  Autoconf and
automake set EXEEXT on these platforms, and leave it empty on others
where no suffix is used.  $(EXEEXT) must be appended to executable names
in custom rules for portability:

http://www.gnu.org/software/automake/manual/html_node/EXEEXT.html

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-03-22 00:45:51 -05:00
Kevin E Martin fc9d733bab dmx: reshuffle linker order to avoid errors when MITSHM is undefined.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-26 13:09:52 +10:00
Peter Hutterer 23dc4678e9 dmx: use top_builddir, not top_srcdir to get libxfixes.la
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Byeong-ryeol Kim <brofkims@gmail.com>
2009-09-14 14:40:37 +10:00
Peter Hutterer 33243ae971 dmx: include xfixes lib, reshuffle include order to resolve linker errors.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:16 +10:00
Peter Hutterer c2c515ead3 dix: remove all but main() from main.c
All other functions are pushed into where they seemed to fit.
main.c is now linked separately into libmain.a and linked in by the various
DDXs.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-04-28 16:03:56 +10:00
Dan Nicholson e1c8ee2157 Don't reuse PKG_CHECK_MODULES identifiers
Using GL for the PKG_CHECK_MODULES identifier multiple times means only
the first call will actually be used. Later calls will be skipped due to
GL_CFLAGS and GL_LIBS already being set. This changes DRI to using a
different identifier and DMX to just reusing GL_CFLAGS.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2009-01-18 09:49:06 -08:00
Eric Anholt a02db0d500 Convert servers to using _DEPENDENCIES to ensure proper rebuilds.
This cleans up server Makefile.ams a little bit, but also means that people
messing with configure.ac need to be careful with whether they put libraries
in the _LIBS or _SYS_LIBS targets.  Hopefully the comment in configure.ac will
clarify the issues.
2007-08-31 13:09:45 -07:00
Brian a240c039c4 Split the xserver/fb/fbcmap.c file into two files.
Now, fbcmap_mi.c contains the fb functions which just wrap mi functions.
Previously, these were in fbcmap.c and compiled when XFree86Server was defined.
Now, clients of fbcmap should either use fbcmap.c or fbcmap_mi.c and not worry
about setting the XFree86Server symbol.
2007-04-03 09:28:21 -06:00
Brian 9f24798af5 ompile fbcmap.c w/ -DXFree86Server instead of linking libfbcmap.a.
The former works, the later doesn't (DMX blows up on visuals/pixel formats).
This undos Daniel's patch, which undid my prev patch.  Revisit someday.
2007-03-30 12:49:34 -06:00
Daniel Stone 17d85387d1 dmx, vfb, xnest: fix fbcmap compilation
Don't always define XFree86Server, but only for damn fbcmap.c.
Split fbcmap.c into its own library to achieve this.
2007-02-05 03:43:10 +02:00
Brian 945b7c6394 The fbcmap.c file used by Xdmx _must_ be compiled with XFree86Server defined.
Otherwise, Xdmx generates a slew of protocol errors.
2006-09-23 10:35:25 -06:00
Michel Dänzer 8356be492c Make sure _XSERVER64 is defined when it should be and gets tested. 2006-09-06 15:20:55 +02:00
Daniel Stone 84683f19b4 get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions.  They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build.  As well as
for miinitext.c.  But largely gone.
2006-07-18 18:17:38 -04:00
Alexander Gottwald 43324132af Added Mesa include directory 2006-02-22 16:08:56 +00:00
Adam Jackson 6798fd0170 Bug #4190: Add a rule for 'make relink' since automake sucks. 2005-12-26 19:13:52 +00:00
Kevin E Martin 4a39354e14 Change *man_SOURCES ==> *man_PRE to fix autotools warnings. 2005-12-06 22:48:51 +00:00
Kevin E Martin 7c00afd0ec Define XFree86Server only where it is required. 2005-12-02 06:02:45 +00:00
Alan Coopersmith 51a721a6db Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
2005-11-28 22:05:09 +00:00
Alan Coopersmith 267cbffa41 Bug #5019 <https://bugs.freedesktop.org/show_bug.cgi?id=5019> xserver
installs manpages into 'man1' instead of 'man1x'
2005-11-13 20:53:24 +00:00
Kevin E Martin 30c1369bf5 Add support for building DMX config and examples programs Add missing files
to EXTRA_DIST Install Xdmx man page
2005-10-06 02:35:22 +00:00
Kevin E Martin ca64aab609 Add build system for building docs and fix setuid issues.
Add build system for sgml docs.
2005-09-27 14:09:31 +00:00
Alan Coopersmith 9657e0e9de Don't try to build dmx/input/lnx-*.c if <linux/keyboard.h> isn't found
Don't try to build dmx/input/usb-*.c if <linux/input.h> isn't found
Replace -rdynamic with $(LD_EXPORT_SYMBOLS_FLAG) for compatibility with
    compilers other than gcc
2005-08-24 15:18:06 +00:00
Kevin E Martin 86529c07d6 Fix distcheck for server 2005-07-28 23:28:34 +00:00
Kevin E Martin b9ccd89918 Fix dmx/glxProxy build 2005-07-27 08:11:26 +00:00
Kevin E Martin 0635acab08 Add record module building support Change module building to not use
-include Fix xnest, dmx and vfb builds to -DXFree86Server for fbcmap
    compilation
2005-07-16 03:46:01 +00:00
Kevin E Martin a407fa373b Move drm up to os-support since the files are shared by multiple platforms.
Fix the dri and drm build. Fix server-side DMX extension build. Make
    xf4bpp use the correct version of mfbline.c for mfbseg.c. Add #ifndef
    _HEADERNAME_H_/#define _HEADERNAME_H_/.../#endif to the headers.
2005-07-15 22:51:05 +00:00
Kevin E Martin 02427d4d04 Add support for building Xdmx and Xvfb 2005-07-12 01:20:36 +00:00
Daniel Stone ded56b1a74 Adding initial build system. 2005-07-01 20:29:53 +00:00