Commit Graph

139 Commits

Author SHA1 Message Date
Rémi Cardona
9480725af0 xfree86: DIST_SUBDIRS should not contain variables
This patch reverts a change done in commit
800d4ceb94 to add conditional XAA support

Signed-off-by: Rémi Cardona <remi@gentoo.org>
2009-06-24 10:15:33 +02:00
Tiago Vignatti
800d4ceb94 configure: Provide the --enable/disable-xaa option.
Acked-by: Daniel Stone <daniel@fooishbar.org>
2009-06-24 00:26:06 +03: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
Paulo Cesar Pereira de Andrade
c7d62d74bb Explicitly add libxorg_la_LIBADD to libxorg_la_DEPENDENCIES
Otherwise, for example, when hacking config/*.c, it is required to
run make clean on that directory, to ensure the proper libconfig.a
will be linked in the generated Xorg binary.
2009-01-25 19:19:01 -02:00
Adam Jackson
0fb4390526 Remove xorgcfg 'Options' list. 2009-01-22 01:13:17 -05:00
Alan Coopersmith
8c488ac3b3 Fix linking of Xorg with dtrace probes on Solaris 2008-12-18 19:47:49 -08:00
Paulo Cesar Pereira de Andrade
b1dac41fb3 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 02:22:19 -02:00
Paulo Cesar Pereira de Andrade
5dbe70dd52 Remove dummylib.
Only cvt required it, and only used XNF{,c}alloc
via xnf{,c}alloc macros.
  Based on patch by Eric Anholt.
2008-12-04 02:42:28 -02:00
Alan Coopersmith
4a61ad427c Update sample xorg.conf file 2008-12-02 14:35:45 -08:00
Alan Hourihane
66a87517bd re-enable DRI2 2008-10-15 12:00:16 +01:00
Adam Jackson
f456f32cd9 Build fix. 2008-08-13 16:21:28 -04:00
Adam Jackson
ccec16e519 Bug #7300: Move xf86RAC to hw/xfree86/common 2008-07-15 11:24:08 -04:00
Adam Jackson
f31bd087e8 Death to mfb.
Anyone still interested in 1 or 4 bpp framebuffers, talk to fb.
2008-06-13 10:51:18 -04:00
Adam Jackson
0dab6fa358 So long, and thanks for all the cfb. 2008-04-11 09:47:51 -04:00
Kristian Høgsberg
b71dc54352 Add DRI2 module. 2008-02-14 19:53:49 -05:00
Daniel Stone
dda10c9066 Remove all traces of external RGB database (and Speedo)
Remove all references to an external RGB database (which hasn't been enabled
for a very long time).  Also get rid of some references to Speedo fonts.
2007-11-05 16:28:35 +00:00
Adam Jackson
dfb1cce28a Restore build of xf8_16bpp.
It doesn't link against cfb, so don't conditionalize its build against cfb.
2007-11-02 12:51:56 -04:00
Ian Romanick
e89d16be07 Revert part of 529acb1754 because libtool is smart. 2007-09-04 14:49:49 -07:00
Eric Anholt
529acb1754 Fix Xorg build by listing circular dependency libraries twice.
One of these I introduced by listing dix and mi in the same library list to
simplify other servers.  The other had been hacked around using libosandcommon,
which is now gone.
2007-09-02 15:16:01 -07: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
Ian Romanick
8b6b40b727 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/common/xf86.h
	hw/xfree86/common/xf86Init.c
	hw/xfree86/common/xf86pciBus.c
	hw/xfree86/int10/generic.c
	hw/xfree86/int10/helper_exec.c
	hw/xfree86/loader/xf86sym.c
	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/Pci.h
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/os-support/linux/int10/linux.c
2007-08-23 18:19:17 -07:00
Daniel Stone
505ec436af XFree86: Properly clean up after ourselves
CLEAN is not a useful variable.  CLEANFILES/DISTCLEANFILES, on the other hand,
are useful variables.
2007-08-01 08:11:08 +03:00
Alan Coopersmith
9fcb30ebf7 Make SOLARIS_INOUT_ARCH substitutions work better with automake-1.10 2007-07-12 13:00:32 -07:00
Ian Romanick
2c6d471088 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/dri/dri.c
2007-03-28 08:08:04 -07:00
Keith Packard
ae75019ccf Create driver-independent CRTC-based cursor layer.
This moves most of the cursor management code out of the intel driver and
into the general server code. Of course, the hope is that this code will be
useful for other driver writers as well.

Check out xf86Crtc.h for the usage information, making sure you add the
needed hooks to the crtc funcs structure for your driver.
(cherry picked from commit 4d81c99a46)
2007-03-15 00:02:40 -07:00
Eamon Walsh
c16343ac2c Make mfb, cfb, and afb support configurable at build-time. 2007-02-27 14:14:47 -05:00
Tilman Sauerbeck
3dbe8f6b6e Distribute hw/xfree86/modes. 2007-02-15 20:37:09 -08:00
Keith Packard
d4eb4d0650 Merge crtc/output-based mode selection code.
This code comes from the intel driver, so there's no history in this tree.

As the crtc/output-based mode selection code uses ddc, the ddc and i2c
modules have been merged into the server. Attempts to load them are safely
ignored now.
2007-02-15 20:36:20 -08:00
Ian Romanick
e1f73d2208 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/common/xf86Configure.c
	hw/xfree86/common/xf86Helper.c
	hw/xfree86/common/xf86pciBus.c
	hw/xfree86/int10/helper_exec.c
	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/os-support/linux/lnx_pci.c
	hw/xfree86/scanpci/Makefile.am
	hw/xfree86/utils/pcitweak/Makefile.am
	hw/xfree86/utils/scanpci/Makefile.am
2006-12-08 17:24:15 -08:00
Daniel Stone
d17ec01e83 remove CID support (bug #5553)
Remove CID from all our fontpaths.
(cherry picked from 69820a10e3 commit)
2006-12-06 23:24:23 +02:00
Keith Packard
20e9144c07 Add $(DIX_CFLAGS) to remaining Makefile.am files 2006-11-07 12:49:28 -08:00
Alan Coopersmith
c03311a1e7 Fix automake error: BUILT_SOURCES was defined multiple times on Solaris 2006-10-31 16:05:48 -08:00
Matthieu Herrb
645d057620 Handle building in a separate objdir 2006-10-29 18:19:56 +01:00
Matthieu Herrb
59584c375f kill GNU-make'ism. 2006-10-29 17:49:46 +01:00
Ian Romanick
8b90913566 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/common/xf86.h
	hw/xfree86/common/xf86DoScanPci.c
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/scanpci/extrapci.ids
	hw/xfree86/scanpci/pci.ids
	hw/xfree86/scanpci/pciid2c.pl
	hw/xfree86/scanpci/xf86PciStdIds.h
2006-10-24 08:57:59 -07:00
Joshua Baergen
62d2409793 Create xorg.conf.example (Gentoo bug #138623). 2006-10-19 11:14:26 -07:00
David Nusinow
a10039a100 Allow the xfree86 ddx utils to be optionally built. Patch by Eugene Konev. 2006-09-21 23:58:32 -04:00
Ian Romanick
65dc25d8f8 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-31 12:30:30 -07:00
Ian Romanick
3112a6c4f2 Noting uses libdummy.a, so don't build it. Only libdummy-nonserver.a
is actually used.
2006-07-31 10:25:31 -07:00
Ian Romanick
69533fc04f Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/common/xf86AutoConfig.c
2006-07-31 09:26:04 -07:00
Adam Jackson
990a400905 Remove getconfig horrorshow. Replace with a static built-in rule list for now. 2006-07-26 19:03:39 -04:00
Ian Romanick
07ad92d2c4 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/common/xf86DoScanPci.c
	hw/xfree86/common/xf86Init.c
	hw/xfree86/common/xf86pciBus.c
2006-07-21 15:25:35 -07: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
Ian Romanick
9d0a15dca5 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:

	hw/xfree86/loader/xf86sym.c
2006-06-22 16:21:10 -07:00
Adam Jackson
d8135eb9e4 Unbreak unbreaking the loader. Re-add the symbol reference lists so that the
linker will include everything it's supposed to.  This is a terrible solution,
but ld semantics don't let you do anything better.
2006-06-21 20:49:21 -04:00
Ian Romanick
75398cff82 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:

	hw/xfree86/loader/Makefile.am
	hw/xfree86/loader/xf86sym.c
2006-06-20 15:49:47 -07:00
Adam Jackson
a28652f9c3 Another round of loader sense-beating. Remove the (unused) server export
lists, a really bad hash table, the last vestiges of the other backends,
and some miscellaneous cleanups.  Good for dropping 300k from the size of
the built server on x86.
2006-06-19 00:57:18 -04:00
Adam Jackson
98a602fab1 Don't bother building RAC as a module, that's just absurd. 2006-06-18 23:54:04 -04:00
Eric Anholt
868e2cab70 Add explicit dependencies (Xorg_DEPENDENCIES = ) on the internal libraries
(such as libcw.la) that we link into the server, causing it to be rebuild
automatically when they're updated.  Some system libraries are included, but
don't appear to cause any harm.  You would think this would be automatic...
2006-06-16 10:17:51 -07:00
Ian Romanick
46f55f5dea Initial batch of changes for PCI rework. All future changes will be
tracked individually.
2006-06-07 14:09:02 -07:00
Adam Jackson
86ffb46358 Bug #5209: Re-enable building APM and ACPI support. (Michel Dänzer) 2006-05-09 18:04:29 +00:00
Adam Jackson
14fdd81614 Remove xf8_32wid, it's dead code with no maintainer interest. Also remove
cfb24, since xf8_32wid was the only user.
2006-01-25 23:05:26 +00:00
Adam Jackson
6798fd0170 Bug #4190: Add a rule for 'make relink' since automake sucks. 2005-12-26 19:13:52 +00:00
Adam Jackson
f4957ee948 Bug #4809: Re-fix that doesn't break distcheck. (Alan Coopersmith) 2005-12-09 18:30:51 +00:00
Kevin E Martin
008c2dd5e4 Add configure options to allow hard-coded paths to be changed. 2005-12-08 17:55:19 +00:00
Alan Coopersmith
26f9c43056 Bugzilla #4809 <https://bugs.freedesktop.org/show_bug.cgi?id=4809> Patch
#3908 <https://bugs.freedesktop.org/attachment.cgi?id=3908> xf8_32wid
    and cfb24 only need to be built on sparc
2005-12-03 17:04:45 +00:00
Kevin E Martin
7c00afd0ec Define XFree86Server only where it is required. 2005-12-02 06:02:45 +00:00
Kevin E Martin
da5d66f2ff Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
module builds to reflect this change.
2005-11-29 16:39:33 +00:00
Kevin E Martin
381931b15b Add configure option to install libxf86config.a (disabled by default). 2005-11-23 07:14:46 +00:00
Alan Coopersmith
e921eec1c6 Make X -> Xorg symlink at install time. 2005-10-29 00:12:33 +00:00
Adam Jackson
2769c3e72c Fix distcheck by forcing Xorg to be installed before chmod/chown. 2005-10-18 19:43:48 +00:00
Adam Jackson
e7007f7d51 More automake 1.7 braindamage: use mkdir -p, not . 2005-10-17 22:42:03 +00:00
Alan Coopersmith
0ee70f53ef Install Xorg & xorg.conf man pages even when not building docs 2005-10-14 22:01:46 +00:00
Kristian Høgsberg
0676a2874a Add sysv and sco os-support subdirs and add simple EXTRA_DIST Makefile.am
in those dirs. Remove unsupported os-support subdirs (bsdi, dgux, hurd,
    nto, os2, pmax, qnx4) that have no maintainer and we don't dist.
Add Options.
2005-10-14 20:01:36 +00:00
Kristian Høgsberg
b349b20d78 Dist NOTES.
Dist helper shell scripts.
Dist XAA.HOWTO and a few more unused C files.
Dist xorgconf.cpp.
Fix DIST_EXTRA typo.
Clean yacc and lex generated files only during make maintainer-clean as we
    don't expect users to have those tools installed.
2005-10-13 18:08:24 +00:00
Alan Coopersmith
a9df169f10 Add missing $(DESTDIR) to custom install target 2005-10-05 17:27:58 +00:00
Alan Coopersmith
22b4200b01 Whoops, need to be in DIST_SUBDIRS too. 2005-10-03 15:41:10 +00:00
Alan Coopersmith
14a2bd3330 Add missing ] (Dawid Gajownik)
Add getconfig (Dawid Gajownik)
2005-10-03 15:37:57 +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
a5477ae7ac Add scanpci, xorgcfg, & xorgconfig utilities. 2005-09-24 02:40:51 +00:00
Alan Coopersmith
7d0f47c43c Add --disable-install-setuid option so you can build as non-root and
chown/chmod later. Also disable by default on platforms that don't need
    setuid root X servers (Darwin & SPARC's, according to
    InstallXserverSetUID settings in the old Imake config files).
2005-09-20 15:50:31 +00:00
Eric Anholt
ef7eef0f68 Bug #4046: Install the X.Org server setuid root. (David Schleef) 2005-09-15 05:55:21 +00:00
Eric Anholt
88d7eb1f7e Bug #3889: Create the log dir on install, and allow configuring
specifically that directory. Failure to have the directory keeps the
    xorg server from starting.
2005-09-15 05:06:54 +00:00
Eric Anholt
0888ad3874 Build xf8_32bpp, which is wanted by the mga driver, and export elf.h, which
is wanted by the rendition driver.
2005-09-14 07:49:22 +00:00
Eric Anholt
12fbcfefe6 Add some initial BSD support for the xorg server. Incomplete on NetBSD,
OpenBSD, and non-i386/amd64 FreeBSD for sure. Plus I haven't actually
    run it yet.
2005-09-13 18:37:35 +00:00
Daniel Stone
bb1d99ee72 Build libxkbstubs.la to stub XKB DDX functions (e.g. VT switches), and
build libxorggxkb.la from within the Xorg DDX to replace the previous
    xf86VT.o, et al, hacks.
2005-08-20 18:07:59 +00:00
Alan Coopersmith
a0366ddb8c Replace gnu-makeism with portable rules 2005-08-18 17:14:11 +00:00
Søren Sandmann Pedersen
46aede552a Mon Aug 15 14:56:57 2005 Søren Sandmann <sandmann@redhat.com>
Remove the xkb* files.
Add xkbVT.o and friends as the last things on the link line so they will
    override the symbols in libxkb.a. Add a comment on how this situation
    might not be considered ideal.
2005-08-15 18:59:16 +00:00
Chris Lee
3639fb2434 Enabling EXA by default in the modular build. 2005-08-06 23:56:18 +00:00
Alan Coopersmith
13bec87f45 Fix inline assembly versions of in*/out* for Sun compilers Add check for
ancient USL console code on Solaris to allow building on old Solaris
    x86 versions
2005-08-04 02:39:56 +00:00
Adam Jackson
2d7b1893be - Workaround for AS_HELP_STRING compatibility with older autoconf.
- New intermediate build target for Xorg server
- ia64 fixes
2005-08-02 00:41:07 +00:00
Kevin E Martin
86529c07d6 Fix distcheck for server 2005-07-28 23:28:34 +00:00
Alan Coopersmith
8e600b8764 Only pass -rdynamic when using gcc 2005-07-16 07:39:48 +00:00
Kevin E Martin
7375f4d136 Add support for Xnest 2005-07-14 03:32:09 +00:00
Søren Sandmann Pedersen
f07e905553 - Add build system for xf86-video-ati
- Add build system for xserver/xorg/hw/xfree86/dri
- Add glcore.h to symlink.sh
- Symlink.sh: add some more DRI files, symlink glcore.h from
    extras/Mesa/include/GL/internal to proto/GL
- proto/GL/Makefile.am: install glcore.h
- xf86-video-ark: s/module-dir/xorg-module-dir/
2005-07-14 00:28:47 +00:00
Lars Knoll
cda9c7b267 add x86emu. 2005-07-12 14:50:10 +00:00
Adam Jackson
327741486e Don't try to link fb, shadow, or vgahw into the loadable Xorg server, as
they're only supposed to be loadable modules.
2005-07-09 02:22:29 +00:00
Daniel Stone
826a6f029f Continuing Makefile cleanup; add DIX_CFLAGS and XORG_CFLAGS everywhere. 2005-07-02 18:59:44 +00:00
Daniel Stone
ded56b1a74 Adding initial build system. 2005-07-01 20:29:53 +00:00