Commit Graph

362 Commits

Author SHA1 Message Date
mrg
ed6a863e07 define USE_AMD64_IOPL on amd64, not USE_I386_IOPL 2008-09-12 07:47:39 +00:00
mrg
ebf7fb1d1a build scanpci and pcitweak on macppc 2008-09-12 07:47:11 +00:00
mrg
bd509f3a81 pull in ${X11FLAGS.SERVER} to pick up _XSERVER64. now amd64 works.
thanks rtr!
2008-09-12 04:59:23 +00:00
lukem
0e21c40f39 Clean xf86DefModeSet.c
Support MAKEVERBOSE
2008-09-07 14:52:48 +00:00
rtr
be56b9b956 enable WSCONS_SUPPORT for the keyboard driver 2008-09-04 12:29:14 +00:00
christos
9bc227a787 unbreak exa 2008-09-01 15:12:22 +00:00
rtr
931faa9d53 - build miext for netwinder, sparc64
- adjust CPPFLAGS for includes needed for sparc64
2008-09-01 10:20:20 +00:00
rtr
506308d8f2 split the exa sources into those required by the archive and those by
the module (like most others) so the sources are exposed for the module
build.
use LIPISPRIVATE=yes for the libexa.a build even though this is mostly
irrelevant since we don't need to build the archive only the module.
2008-09-01 10:18:03 +00:00
rtr
d3349ca75f don't link libexa.a into the Xorg server. instead build the loadable
module with the correct set of sources and they shall provide what is
needed for the i830 driver at runtime.
2008-09-01 10:15:08 +00:00
mrg
b35d38624b enable xf86-video-sis 2008-09-01 05:35:47 +00:00
mrg
4986921884 make this actually build 2008-09-01 05:34:19 +00:00
mrg
bf9812c1a8 note these should move 2008-09-01 05:34:02 +00:00
mrg
3149caec79 link in mga_dri.c, mga_exa.c and mga_storm.c as necessary. 2008-09-01 04:21:04 +00:00
mrg
6d649e0cf2 build ct_accelmm and ct_accelhi.
fixes link-time issues at least, seen with X -configure.
2008-09-01 04:04:04 +00:00
christos
5d15fb914f enable exa; needed by the i830 intel driver. 2008-08-31 19:59:43 +00:00
christos
9f6302fe9b enable the intel driver 2008-08-31 19:58:06 +00:00
chris
95b471e08e Build scanpci and pcitweak for cats. 2008-08-31 12:52:09 +00:00
rtr
95f8e591aa - don't build lnx_agp.c on !AGP machines
- build the .c versions of BUSmemcpy.c IODelay.c SlowBcopy.c for any
  of macppc cats sgimips sparc64 sparc netwinder shark ofppc
2008-08-31 09:58:47 +00:00
rtr
0b9e1f4852 build miext libs for shark 2008-08-31 09:55:11 +00:00
christos
3198f26989 don't use awk to extract major,minor,patch 2008-08-31 08:46:51 +00:00
mrg
d01b9b5ea4 install symlink from X -> Xorg. 2008-08-30 07:17:02 +00:00
mrg
304214055b build xorgconfig. 2008-08-30 06:36:33 +00:00
mrg
3f1b0bf463 decend into xf86-video-nv. 2008-08-30 04:44:46 +00:00
mrg
e582e7fa7f install vesa.4. 2008-08-30 04:44:34 +00:00
mrg
667cc9fca9 don't build stdResource.c on macppc. 2008-08-30 01:06:35 +00:00
mrg
cb0ad860fb amd64 has MACHINE_ARCH of x86_64 2008-08-30 01:05:59 +00:00
rtr
1ab43164ff - re-enable build of libddc it is needed as a convenience lib for linking
the Xorg server.
- define LIBISPRIVATE=yes for libddc so we don't get a module build
2008-08-29 07:46:19 +00:00
rtr
bc2f87a3cb it is LIB=xtrap not LIB=XTrap 2008-08-29 04:30:07 +00:00
rtr
2429ee8035 don't build or install libddc 2008-08-29 04:13:02 +00:00
mrg
3c54dc853b add -Wl,--whole-archive ... -Wl,--no-whole-archive around the
xorg-server libs, so everything is linked in.  necessary for
modules to load.
2008-08-28 08:37:01 +00:00
mrg
dee0ade029 don't link xf86cvt.c, it's in xf86modes already. 2008-08-28 08:36:03 +00:00
mrg
fc551bd26f build xf86-video-radeon driver, as well as xf86-video-ati. 2008-08-28 07:49:05 +00:00
mrg
b3d9410523 COPTS.cursor.c+= -Wno-error 2008-08-28 07:34:20 +00:00
mrg
69cb79d655 COPTS.compwindow.c= -Wno-error 2008-08-28 07:33:38 +00:00
mrg
1f86556e49 add CPICFLAGS to COPTS -- this library is linked into a shared lib. 2008-08-28 07:33:22 +00:00
mrg
90f8533a21 add miext/cw. 2008-08-28 07:32:49 +00:00
mrg
22410694ef look for generated config.h. 2008-08-28 07:22:30 +00:00
mrg
e5414b3513 add xf86-video-radeon 2008-08-28 07:22:02 +00:00
mrg
733fc86b2b don't check MKXORG here. 2008-08-28 07:21:44 +00:00
mrg
fbe5f55fce this driver should be installed as kbd_drv 2008-08-28 01:36:55 +00:00
rtr
8e6f40cefd fix CPPFLAGS for module builds 2008-08-26 04:05:35 +00:00
rtr
697d639db6 use XORG_VERSION_CURRENT defined in Makefile.serverlib instead of
defining it all over the shop
2008-08-24 13:47:05 +00:00
rtr
209734477b make obsolete MKX11LOADABLE
define XORG_VERSION_CURRENT here instead of ~everywhere else
remove mips specific knob to enable ELF modules we use them everywhere now
2008-08-24 13:43:57 +00:00
rtr
262f055daf * use LIBISPRIVATE instead of MKX11LOADABLE
* reorganize SRCS into SRCS.<lib> to be consistent with other libs
* cleanup CPPFLAGS
2008-08-24 13:40:13 +00:00
rtr
e09e7ba8f4 * use LIBISPRIVATE instead of MKX11LOADABLE
* reorganize SRCS into SRCS.shadow to make them available for the module build
* cleanup CPPFLAGS
* build libshadow.so module with more correct set of SRCS
2008-08-24 13:37:33 +00:00
rtr
7fa94bbc14 * use LIBISPRIVATE instead of MKX11LOADABLE
* reorganize SRCS into SRCS.mfb to make them available for the module build
* cleanup CPPFLAGS
* build libmfb.so module with more correct set of SRCS
2008-08-24 13:30:20 +00:00
rtr
7e73b6b74b * use LIBISPRIVATE instead of MKX11LOADABLE
* reorganize SRCS into SRCS.XTrap to make them available for the module build
* cleanup CPPFLAGS
* build libXTrap.so module with more correct set of SRCS
2008-08-24 13:25:03 +00:00
rtr
ef7ceee5bf * use LIBISPRIVATE instead of MKX11LOADABLE
* reorganize SRCS into SRCS.cfb32 to make them available for the module build
* cleanup CPPFLAGS
* build libcfb32.so module with more correct set of SRCS
2008-08-24 13:24:12 +00:00
rtr
cdac501c2a * use LIBISPRIVATE instead of MKX11LOADABLE
* reorganize SRCS into SRCS.cfb to make them available for the module build
* cleanup CPPFLAGS
* build libcfb.so module with more correct set of SRCS
2008-08-24 13:23:33 +00:00
rtr
58d407c89b stop using XSERVERINCDIR since it was referencing src/x11 reachover
this is not correct for xorg reachover
2008-08-15 15:55:05 +00:00
rtr
53b3cad8e5 remove special case NOPIC for mips 2008-08-15 10:31:12 +00:00
rtr
f431523df6 SHLIB_MAJOR=0 if defined(XMODULEDIR) 2008-08-10 11:56:06 +00:00
rtr
16734c80a9 set SHLIB_MAJOR=${PACKAGE_MAJOR}
just set LIBDIR= don't bother with allowing override
2008-08-10 11:28:42 +00:00
rtr
47be36a913 fix my lousy awk 2008-08-10 10:26:10 +00:00
rtr
aef88f4580 no need to MKLINT=no since LIBISMODULE=yes does this for us 2008-08-10 09:38:22 +00:00
rtr
a8e904b030 remove cheesy hack moduleinstall target and use LIBISPRIVATE=yes 2008-08-10 09:29:08 +00:00
rtr
ad9ac2f860 CPPFLAGS+=-DXFree86LOADER for drivers 2008-08-10 07:39:13 +00:00
rtr
5f3ad3acc9 * use SRCS.record
* build and install librecord.so to modules/extensions
2008-08-10 06:43:29 +00:00
rtr
5e49e25553 * LIBISPRIVATE=yes for librecord.a
* expose SRCS.record for use by librecord.so
* fix includes
2008-08-10 06:42:39 +00:00
rtr
15b69ba7a1 install libtype1.so to modules/fonts 2008-08-10 06:30:21 +00:00
rtr
b91f4d517c * install libfreetype.so to modules/fonts 2008-08-10 06:28:16 +00:00
rtr
7f5e032bbb * install libdri.so to modules/extensions
* libdri.so depends on libdrm
2008-08-10 06:21:36 +00:00
rtr
f6a4f9e77d * override libinstall with moduleinstall from src/x11
* define NOSHLIB_VERSION (not yet in bsd.lib.mk)
  - together these allow us to install foo_drv.so to XMODULEDIR
2008-08-09 11:18:05 +00:00
rtr
5778b47a61 * grab SRCS.fb from libfb.a
* install libfb.so
2008-08-09 11:16:02 +00:00
rtr
509b7dee9f * don't install libfb.a
* remove old module kruft
* expose SRCS.fb for dixmod/libfbmod.so
2008-08-09 11:14:52 +00:00
rtr
cd86a737b6 clean up the build of libdbe.a and libdbe.so 2008-08-09 09:08:25 +00:00
rtr
92db0aeceb LDFLAGS+= -rdynamic 2008-08-09 09:07:40 +00:00
rtr
784dab8864 * define XMODULEDIR for the dbe module
* set LIBDIR=${XMODULEDIR} for dixmods
2008-08-09 07:22:21 +00:00
rtr
0a2b3822d4 make this build more like the xorg build and cleanup DPADD while i'm here 2008-08-09 06:50:17 +00:00
rtr
ae99eebc42 backout and properly fix previous removal of sources. these libs are now
built more like the xorg native build
2008-08-09 06:48:17 +00:00
rtr
af10568256 * install to modules/extensions
* link libXextmodule.a into the final module
2008-08-09 05:40:34 +00:00
rtr
f71aace37b don't built all sources into all archives it causes us to have deps we
do not want
2008-08-09 05:26:41 +00:00
mrg
65ed99616e make Xorg link on macppc, and fix one cats error 2008-08-09 05:20:52 +00:00
mrg
395dc81b92 add a .WAIT before hw 2008-08-09 04:39:49 +00:00
mrg
1220511007 use -li386 on i386 and -lx86_64 on x86_64 2008-08-09 04:38:32 +00:00
rtr
b47485d2c4 os-support -> xorgos directory rename so Makefile.Xserver can find
libxorgos.a when it needs it
2008-08-09 03:26:39 +00:00
mrg
d48c25f954 find <xorg-config.h> 2008-08-09 02:46:41 +00:00
rtr
77c6f64de6 re-order the link
add new things to the link
make it link!

XXX DPADD needs to be fixed
2008-08-09 01:25:25 +00:00
rtr
7541b2e663 installed module so define XMODULEDIR 2008-08-09 01:24:16 +00:00
rtr
34c11b32b6 * build additional sources
* generate xf86DefModeSet.c from modeline2c.awk
2008-08-09 01:23:43 +00:00
rtr
bb55518a93 crib modeline2c.awk from pkgsrc from Joerg Sonnenberger
- based on Perl script by Dirk Hohndel.
2008-08-09 01:22:08 +00:00
rtr
a026a85889 don't build .S versions right now. xorg auto<foo> doesn't build them
either as far as I can tell.  the .S versions don't even seem to have
the syms we need anyway
2008-08-09 01:18:20 +00:00
rtr
ecfa5502bd add some more libs we need for linking and running Xorg server 2008-08-09 01:16:39 +00:00
rtr
5e015a6a13 rename some directories and fix up the libs they produce so the goo in
Makefile.Xserver works building LDADD.foo
2008-08-09 01:15:19 +00:00
mrg
22e7e15fc7 list most of the correct libs/depends. not so many link errors now. 2008-08-07 06:37:20 +00:00
mrg
24eb37443f attempt to link Xorg. gets missing main. 2008-08-06 07:38:15 +00:00
mrg
1991c9d521 remove a non-existant include path 2008-08-06 07:37:38 +00:00
mrg
6b3899ff7a add a bunch of hw/xfree86 dirs 2008-08-06 07:37:19 +00:00
mrg
de486b6871 build all the dixmod parts, completing all the interesting subdirs
of hw/xfree86 i believe.
2008-08-06 07:16:39 +00:00
mrg
406f97d512 build xf1bpp, xf4bpp, xf8_16bpp and xf8_32bpp from hw/xfree86. 2008-08-06 06:14:33 +00:00
mrg
ca75fb56f4 build the modes, shadowfb, vbe, vgahw and xaa subdirs from hw/xfree86. 2008-08-06 05:10:40 +00:00
mrg
e27128919a remove libint10 and Xvfb. 2008-08-06 04:15:06 +00:00
mrg
e188230032 build hw/Xvfb. 2008-08-06 04:14:35 +00:00
mrg
806ca44ce9 add dri, int10 & loader subdirs to hw/xfree86. 2008-08-05 05:58:52 +00:00
mrg
ae96501ecd don't install libramdac.a 2008-08-05 05:58:12 +00:00
mrg
b286890c29 add parser, rac and ramdac dirs from hw/xfree86. 2008-08-05 05:25:49 +00:00
mrg
19b7082086 enable hw, and note a few things we need to do 2008-08-05 05:24:47 +00:00
mrg
84d5845858 install exa.4 2008-08-05 04:52:19 +00:00
mrg
c190c3182b add common doc and i2c subdirs to hw/xfree86 2008-08-05 04:50:18 +00:00
mrg
10e0676fc0 note that libscanpci is installed normally 2008-08-05 04:49:42 +00:00
rtr
234e5094c0 libexa.a module reachover 2008-08-04 11:41:50 +00:00
mrg
29ae370314 build scanpci, utils/pcitweak and utils/scanpci from hw/xfree86.
only build ioport, scanpci and pcitweak on x86 (for now?)
2008-08-04 04:34:22 +00:00
mrg
9e38c894d9 don't add -lx86_64 on !i386, but only x64_64. 2008-08-04 04:33:00 +00:00
mrg
c609e5382d add a hack to build Xnest.1. 2008-08-04 04:32:17 +00:00
mrg
ee6163047f add libscanpci.a support. 2008-08-04 04:31:38 +00:00
mrg
5eb6f396c1 add os-support and scanpci subdirs 2008-08-04 04:30:59 +00:00
mrg
3c357c7414 don't build vmmouse on !x86. 2008-08-04 04:29:44 +00:00
mrg
a8f5ff2229 build libxorgos.a and ioport. 2008-08-04 01:03:34 +00:00
mrg
05cf1f4250 build libdummy and cvt. 2008-08-03 23:00:41 +00:00
mrg
6221b69a62 begin to suport hw/xfree86/utils. only gtf builds so far. 2008-08-03 22:33:34 +00:00
mrg
c4817268ff build libglx.a. 2008-08-03 22:11:10 +00:00
mrg
99376ba256 move X server linking into hw/ like in xorg-server itself. 2008-08-03 22:09:56 +00:00
mrg
375e03fca2 define HAVE_XNEST_CONFIG_H. 2008-08-03 22:09:12 +00:00
mrg
3981cdd170 add rrxinerama.c. 2008-08-03 22:07:39 +00:00
mrg
7c90775d9b build Xnest itself from here, like xorg-server does.
also, now Xnest links.
2008-08-03 22:07:08 +00:00
mrg
9d61f212fe build libXext properly. normalise some makefiles. 2008-08-03 22:06:30 +00:00
rtr
bbc728e1ca major, minor and patchlevel CPPFLAGS now come from Makefile.xf86-driver 2008-08-03 14:47:26 +00:00
rtr
2c74f4c039 define major,minor,patchlevel and xorg version defines for CPPFLAGS here
instead of throughout individual drivers
2008-08-03 14:46:01 +00:00
rtr
d4584d3b36 make it build 2008-08-03 13:10:31 +00:00
rtr
89322354a2 add cirrus_alpine and cirrus_laguna 2008-08-03 12:56:44 +00:00
rtr
e177a82be2 add xfree86
add xfree86/ddc
2008-08-03 12:30:18 +00:00
rtr
8976d3e312 LIBISPRIVATE=yes these archives are only used when linking Xservers 2008-08-03 11:56:27 +00:00
rtr
3215aa71a4 * traverse into xf86-video-* directories that compile
* make most drivers build with the SRCS they do specify though it is likely
  most would explode when loaded by the server
2008-08-03 09:24:14 +00:00
mrg
60daecae82 get almost linking - about 10 symbols to go.
fix up DPADD properly.
2008-08-03 08:10:31 +00:00
mrg
9303d31c47 add ${X11FLAGS.EXTENSION} 2008-08-03 08:09:52 +00:00
mrg
e93ff23a24 add fontcache.c 2008-08-03 08:09:33 +00:00
mrg
0c56616aaf fix some linking order. still does not link yet, but much closer 2008-08-03 07:32:08 +00:00
rtr
5ba15890fe oops these drivers are video not input 2008-08-03 07:32:03 +00:00
mrg
753baef465 enable rpmauth.c / secauth.c. 2008-08-03 07:31:25 +00:00
rtr
9e72f9d805 add the bulk of xf86-video-* driver reachovers
- there are still a few more to come
  - most of these have incomplete SRCS at the moment
2008-08-03 07:20:59 +00:00
rtr
43f269ea73 add the rest of xf86-input-* to the build 2008-08-03 06:30:09 +00:00
rtr
3db0e9e2e1 what was once lost has now been found add MAN= kbd.4 2008-08-03 06:18:24 +00:00
rtr
6f7f044349 * define necessary VERSION CPPFLAGS for kbd.c to build
* remove MAN= Keyboard.1 (doesn't seem to exist)
2008-08-03 06:11:05 +00:00
rtr
18db7a5c58 traverse into drivers since what we do have there now builds 2008-08-03 06:09:48 +00:00
rtr
9d6e3b1958 * add some magic PRINT_PACKAGE_{MAJOR,MINOR,PATCH} printing scripts and use
them to generate CPPFLAGS for drivers.
2008-08-03 06:02:29 +00:00
rtr
cb92411bea .include <bsd.subdir.mk> 2008-08-03 04:42:27 +00:00
mrg
108e11a80a link in -lm. 2008-08-03 03:55:37 +00:00
mrg
9b4974cb0a use the right files, and the right defines. 2008-08-03 03:55:17 +00:00
mrg
796be2b98f initial build glue for hw/xnest / Xnest. doesn't yet link but
does attempt to try.
2008-08-03 03:37:05 +00:00
mrg
4dbf6c3df0 add X11INCDIR/xorg to the include path 2008-08-03 03:17:16 +00:00
mrg
c192f05067 fix the name of this library. 2008-08-03 03:16:41 +00:00
mrg
314c0cffaf add some more includes paths, define HAVE_DIX_CONFIG_H and ignore
warnings for xres.c.  now this builds properly.
2008-08-03 03:14:48 +00:00
rtr
c3d6a15f0c {SUBDIR.cfb} -> ${SUBDIR.cfb} 2008-08-03 01:13:44 +00:00
mrg
bd85f4f930 add xorg-server build support for composite, config and exa. 2008-08-02 21:44:14 +00:00
mrg
f057c79b45 actually make this build. 2008-08-02 21:30:42 +00:00
mrg
edf20c220e add xorg-server build support for XTrap, cfb, cfb32, damageext,
record and xfixes.
2008-08-02 21:19:21 +00:00
mrg
4e68f45f9b install record/set.h 2008-08-02 21:18:49 +00:00
mrg
9dfab9540f build xorg-server xkb, dbe and mfb dirs. maybe be ready to build afb. 2008-08-02 20:41:29 +00:00
mrg
7b1eb4a4d7 install xkb.h and xkbDflts.h 2008-08-02 20:39:30 +00:00
mrg
54e0e80036 add Xi and os subdirs 2008-08-02 19:54:24 +00:00
mrg
af8d2d6f64 build xorg-server/os 2008-08-02 19:53:31 +00:00
mrg
2d2693ed5b build xorg-server/Xi. 2008-08-02 19:42:15 +00:00
mrg
2ed360aec7 add xorg-server Xext from rtr@. thanks!
add Xext to the list of working subdirs.
2008-08-02 19:27:28 +00:00
rtr
ea126b5a0d don't install Xserver.1 from here. it has been moved to doc/Makefile 2008-08-02 15:25:50 +00:00
rtr
e4b45d48ce remove use of MKX11LOADABLE since it isn't defined 2008-08-02 13:27:28 +00:00
mrg
47c6183325 install all the header files that packages expect. 2008-08-02 06:40:56 +00:00
mrg
0f422673eb don't build rootless 2008-08-02 06:37:57 +00:00
mrg
0012c5e62d begin to support some xorg-server drivers. xf86-input-void builds
but xf86-input-keyboard's kbd.c still has an error.
2008-08-02 06:32:02 +00:00
mrg
52fb40e072 list the actually working SUBDIRs, and also list the desired set. 2008-08-02 04:46:57 +00:00
mrg
1274ed5cb5 enable decending into xorg-server 2008-08-02 04:42:19 +00:00
mrg
a58266a796 start of build-glue support for xorg-server bits.
building so far:
	doc include dix fb mi miext randr render


again based on the work rtr made for xorg support, and of course this
is very much based on the work lukem did originally for src/x11, as is
all the stuff in src/external/mit/xorg.

hi luke! :)
2008-08-02 04:32:00 +00:00
mrg
2980e352a1 initial import of the crossbuild framework for modular Xorg. this
is heavily based upon the work rtr@ did on src/x11, but hacked to
work for modern modular Xorg source split.

the sources will live in xsrc/external/mit/<package>/dist.

documentation on using this will come when the above directories
are fully populated.  there are 192 of them so it may take some time
before that is completed.
2008-07-29 05:01:21 +00:00