Commit Graph

309 Commits

Author SHA1 Message Date
rtr 12cdb6c3cf move libos.a down in the link line so its version of GetTimeInMillis() is
not the one linked (instead we get the version from libxnest.a and libxvfb.a)
appropriately.
2004-02-21 08:32:34 +00:00
sekiya 6b0d2196d3 Add sgimips as a valid XFree86 server target. 2004-02-21 01:51:43 +00:00
rtr afb68f3457 compile correct path to 'Cards' file into xf86config
this is into response to (not so)recent post I can't find and should
resolve the described problem i.e. Cards file wasn't found.
2004-02-18 04:59:56 +00:00
chris f1d5c4b47a Add cross build glue for cats. 2004-02-13 16:56:19 +00:00
mhitch 756f7c1000 Xamiga needs FORCE_SEPARATE_PRIVATE. 2004-02-13 04:49:00 +00:00
lukem dfbe2402b8 fix dependency on xf86Build.h, and add some comments 2004-02-09 04:18:24 +00:00
lukem c3af380567 no need to determine XSERVERINCDIR here 2004-02-09 00:28:25 +00:00
lukem 96457165ec add DPSRCS entry for .h file created with BUILDSYMLINKS 2004-02-09 00:25:05 +00:00
lukem c874e04b84 * add xf86PciIds.h to DPSRCS to fix parallel make issue
* there's no need to find the .OBJDIR of this directory for includes
  as -I. suffices.
2004-02-08 23:27:38 +00:00
rtr e620708b1d add X -> Xdreamcast default symlink 2004-02-07 12:46:48 +00:00
rtr 0aed830d75 Xdreamcast now builds so turn it on. 2004-02-07 12:28:13 +00:00
rtr 2e1bb1e734 place a seconf libcfb on the link line after libcfb16.a since it refs
libcfb.a symbols.  This lets Xdreamcast build.
2004-02-07 12:27:33 +00:00
rtr cd87f297eb + Xdreamcast reachover, by default turned off.
+ sorting of various XSERVER_ entries in Makefiles
+ addition of Xpmax Xdreamcast Xmacppc XSERVER_ entries
+ consistent use of != "no" instead of == "yes" changes
2004-02-07 08:30:34 +00:00
lukem 8d125fd0e6 Cache XSERVERLIB determination in Makefile.serverlib rather than
in 111 separate places.  Speeds up empty "cleandir" from 27.17s to 13.75s.
2004-02-07 06:52:04 +00:00
lukem cb53a4d3d5 don't need .PATH here 2004-02-07 05:23:56 +00:00
rtr 5ce86a019f use ${PRINTX11VERSION} 2004-02-06 11:58:56 +00:00
rtr fe5ae52dea + print MACHINE not MACHINE_ARCH for OSNAME
+ add release to OSNAME
2004-01-26 05:14:13 +00:00
mhitch 24e7e49ae8 Xamiga does not need NEED_SCREEN_REGIONS. 2004-01-25 05:20:02 +00:00
rtr 74e6f70b7d + No need to undefine -UXF86VIDMODE twice
+ No need to define XF86DRI since it's never defined to begin with
+ __GLX_ALIGN64 now defined globally in X11FLAGS.EXTENSION.
2004-01-25 02:19:38 +00:00
rtr 364a6162e7 define -DHAS_MTRR_BUILTIN -DUSE_I386_IOPL for x86_64
patch from njoly@pasteur.fr
also MACHINE == "amd64" -> MACHINE_ARCH == "x86_64"
should resolve pr#24204
2004-01-24 05:51:20 +00:00
rtr 0f0f0dce34 -lx86_64 if x86_64 2004-01-23 08:59:20 +00:00
rtr 099ae88634 x86_64 (amd64) link w/ libx86_64 where appropriate 2004-01-23 08:45:02 +00:00
matt e78cfba9ff Add amd64 support. 2004-01-19 00:36:09 +00:00
lukem 9bd8d033a9 Don't bother installing:
./usr/X11R6/lib/X11/etc/sun.termcap
	./usr/X11R6/lib/X11/etc/sun.terminfo
	./usr/X11R6/lib/X11/etc/xterm.termcap
	./usr/X11R6/lib/X11/etc/xterm.terminfo
2004-01-19 00:30:01 +00:00
rtr 3f64bae6d7 reachover for libamiga.a forgotten in Xamiga import 2004-01-18 05:36:19 +00:00
rtr c3936a1977 + Reachover for XdecNetBSD, XalphaNetBSD, Xarm32VIDC
XXX certain extensions should/should not be built and linked that are.
XXX X -> symlink defaults may not be appropriate.
2004-01-18 05:35:03 +00:00
rtr 462bd38713 SUBDIR.afb for Xamiga 2004-01-18 05:24:45 +00:00
rtr 67730f2e2d add dependencies 2004-01-17 06:39:43 +00:00
rtr fd3ecbad7e add XSERVER_XAMIGA and XSERVER_HAS_AFB 2004-01-17 04:06:18 +00:00
rtr 3bea515962 Xamiga reachover 2004-01-17 04:03:26 +00:00
rtr 3c57e953ad build libamiga.a if Xamiga 2004-01-17 03:56:25 +00:00
rtr dd6e622644 NEED_SCREEN_REGIONS for Xamiga 2004-01-17 03:53:54 +00:00
rtr 8c37b5823c amiga needs XINPUT for Xnest 2004-01-17 03:50:51 +00:00
rtr d7a05a6f4b fix typo MCopy -> Mcopy 2004-01-13 15:55:14 +00:00
rtr 78c129485b no FB then VFB for x68k 2004-01-11 13:28:46 +00:00
rtr 017db572b5 build Xvfb by default 2004-01-11 09:07:28 +00:00
rtr c3eb974543 make Xvfb use GetTimeInMillis() from libos.a if its there 2004-01-11 08:30:42 +00:00
lukem e0d2e74a5d tweak some XTODO items 2004-01-10 23:35:55 +00:00
rtr a63b539adb Undefine DDXTIME if XFree86 server is being built since XFree86 provides
its own copy of GetTimeInMillis().

+ This allows us to get rid of multiple versions of GetTimeInMillis().
  It is provided by libos.a if DDXTIME is undefined.

XXX macppc may be a special case since it builds both XFree86 and Xmacppc
    will resolve later if found to be an issue.
2004-01-10 16:28:29 +00:00
rtr 42fd51da28 + Manpages
+ Wrap lines > 80 chars
2004-01-10 16:14:37 +00:00
rtr 80a1b2e48d + add Xmac68k manpage.
+ wrap lines > 80 chars
2004-01-10 14:44:18 +00:00
rtr b841d1dd82 trim include dirs not needed 2004-01-10 13:04:03 +00:00
rtr 4500ee8592 remove drivers not in macppc lists 2004-01-10 13:02:13 +00:00
rtr 1ecafccdd3 Reachover for Xpmax, it builds as good as it ever did from native XF3. 2004-01-10 05:26:14 +00:00
fredb 782d376ab0 Add and enable cross-build framework for Xmac68k X server using patches
submitted by David P. Reese Jr. in PR xsrc/23968, updated for the recent
changes that have been made in "src/x11". (This currently builds and runs,
unlike the native XF4 mac68k xsrc build.)
2004-01-10 04:34:33 +00:00
minoura 1b60d5c936 Make symlink X -> X68k. 2004-01-08 12:29:49 +00:00
lukem b2c15cb7bf Fix generation of XF86Config.eg and XF86Config.98. 2004-01-08 05:07:41 +00:00
lukem a4b9f943c1 move xf86PciIds.h from SRCS to DPSRCS, so TRT happens... 2004-01-08 04:39:16 +00:00
lukem f165d2f537 fix previous; the original srcfile is called XF86Config.indy already 2004-01-08 04:25:34 +00:00
rtr 151654f33f install example XF86Config files 2004-01-08 04:22:11 +00:00
lukem ea0dd22e5d Build xf1bpp. (from rtr@, with tweaks by me) 2004-01-08 04:20:27 +00:00
rtr a1d1f64137 XF86Config.indy example 2004-01-08 04:20:00 +00:00
rtr 1b8ba79ff5 X -> XFree86 symlink, if this default is not suitable someone else is
free to provide an alternative.
2004-01-08 03:36:24 +00:00
rtr 32c7613ddb .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \
${MACHINE} == "macppc" || ${MACHINE} == "cats"

Build Xvfb
2004-01-08 03:33:55 +00:00
rtr 82f1915f4a fbdevhw manpage 2004-01-08 03:31:54 +00:00
minoura 57eedd4f2c Descend to X68k SUBDIR. 2004-01-07 13:07:49 +00:00
minoura a324b4c25b Let him know about hw/netbsd/x68k DDX. 2004-01-07 13:07:20 +00:00
minoura 3cc13e1bb6 Build X68k if ${MACHINE} == "x68k". 2004-01-07 13:05:48 +00:00
minoura d9c2ebaf90 x68k SUBDIR. 2004-01-07 13:04:53 +00:00
minoura 323da9bcad Reachover Makefile for the X68k server. 2004-01-07 13:02:54 +00:00
minoura 6367c9b2ef Reachover Makefile for the DDX part of the NetBSD/x68k X server. 2004-01-07 13:02:27 +00:00
rtr 388ca1e80d install Cards & Options FILES 2004-01-06 16:11:49 +00:00
rtr 371160719f XVFB for macppc 2004-01-06 15:08:21 +00:00
rtr 52bac034e4 X11/etc includes sun.{termcap,terminfo} 2004-01-06 14:16:19 +00:00
rtr c32559bd19 libspeedo.a loadable module 2004-01-06 14:12:36 +00:00
mrg f4666cfbc5 - factorize some common per-platform definintions into a new Makefile.common
- conditionalise more of the main subdirs based on XSERVER_XXX variables, and
  set these as necessary in Makefile.common

XXX: perhaps list the Xwhat -> X symlink name in Makefile.common?
2004-01-06 12:30:13 +00:00
rtr 0eb1806afb loadable xtt modules for XFree86 X server 2004-01-06 06:46:50 +00:00
rtr 1ad775737b create X -> Xsun symlink
XXX if someone dislikes this as a default they're free to provide another
solution.
2004-01-06 06:18:14 +00:00
rtr 9723cd6d45 constype and kbd_mode for sun 2004-01-05 13:19:17 +00:00
rtr ccdb07b2cc add keyboard.4 manpage 2004-01-05 10:16:18 +00:00
rtr 4000871e51 All remaining modules except xf1bpp which may need special handling. 2004-01-05 10:14:18 +00:00
rtr 241604c488 dont override MAN= w/ MAN= must have been sleeping 2004-01-05 05:36:20 +00:00
rtr dadf1c4fd2 cirrus driver sub-modules alpine & laguna. 2004-01-05 05:31:12 +00:00
rtr 250ac0853c OS/Driver readme files xfree86 specific. 2004-01-05 05:18:08 +00:00
soren 6a8f6bd71b Back out previos; xf86Pci.h is linked from XSERVERINCDIR.
Pointed out by Tyler.
2004-01-05 03:48:38 +00:00
soren ce4f8ccef2 Use XSERVERINCDIR. 2004-01-05 03:47:10 +00:00
soren bea92f5554 Needs os-support/bus for xf86Pci.h. 2004-01-05 02:43:37 +00:00
takemura 2302078a2d Added Xserver/Xserver/Xhpc and Xserver/hw/netbsd/hpc directories for
cross building Xhpc. Now Xhpc works on hpcmips.
2004-01-03 02:05:49 +00:00
rtr df08e4e233 back out the symlink but keep the man change 2004-01-02 06:31:11 +00:00
rtr c0f92f4068 add MAN for XFree86
add X -> XFree86 symlink
2004-01-02 06:24:24 +00:00
rtr 98d8fb0a60 add missing symlink inb -> ioport 2004-01-02 06:22:05 +00:00
rtr f671d53b96 do manpages for input drivers 2004-01-02 06:20:26 +00:00
rtr e8de4a4ac8 newport and imstt drivers reachover 2004-01-02 06:19:22 +00:00
rtr 6db9dfd7c5 + add newport & imstt drivers
+ manpages for drivers
2004-01-02 06:17:34 +00:00
mrg f526c09c1a build cross Xmacppc. 2003-12-27 15:16:54 +00:00
mrg 9cca1181ca - decend into xfree86 for cats.
- decend into hw/netbsd/macppc for macppc.
- clean up.
2003-12-27 15:16:09 +00:00
mrg a7bb38194c add hw/netbsd/macppc to the loop 2003-12-27 15:14:40 +00:00
rtr 553b99b011 input drivers for xfree86 2003-12-27 03:14:56 +00:00
rtr fd8b116e51 xfree86 drivers 2003-12-26 14:53:10 +00:00
rtr 5672f93b92 set endianness in for Xserver libs. 2003-12-26 08:23:30 +00:00
rtr 7fed0f0abd Makefile to build subdirs 2003-12-26 08:22:10 +00:00
rtr 17787083c5 Various xfree86 specific progs. 2003-12-26 05:23:15 +00:00
rtr 01461329c4 dummy,scanpci,xloader libs used for building various programs
XXX scanpci is currently built once with module flags but may need to be
    built without for linking with programs.
2003-12-26 04:53:24 +00:00
rtr 99c708121c Whitespace fixes & MOD -> MODULE as it should have been. 2003-12-26 04:15:16 +00:00
rtr 34c46e53ac Install libxf86config.a
Install f86Parser.h xf86Optrec.h incs.
2003-12-24 12:44:17 +00:00
rtr c48b9a1a6a dont build Xfont modules for sparc{,64} 2003-12-23 14:44:07 +00:00
rtr aa135873f2 dont try to use things that couldnt possibly be defined -- cleanup 2003-12-23 14:28:20 +00:00
rtr a29ac0b675 no more lbxutil subdir 2003-12-23 10:48:45 +00:00
rtr 854db33d43 Loadable drivers for XFree86. 2003-12-23 10:46:27 +00:00
rtr a8feda508b turn on xfree86 subdir build 2003-12-23 10:26:37 +00:00
rtr c43324f842 Don't build libXfont.a and liblbxutil.a a second time for Xserver. 2003-12-23 10:24:48 +00:00
rtr 22a5ed24db Don't rely on libs built from Xserver anymore, they're going away, instead
link to those installed (and were built from x11/lib)
Makefile.Xserver - don't create vars for dirs that soon won't exist.
2003-12-23 10:23:07 +00:00
rtr 109ee0636a turn on XFree86 prog build 2003-12-23 10:20:57 +00:00
rtr d1074fcf15 bitmap, type1 and freetype loadable mods for XFree86. 2003-12-23 10:04:14 +00:00
rtr e1d17a42a2 entry point for subdirs 2003-12-23 05:03:27 +00:00
rtr 16fc90e5a6 build fontbase for non-sparc 2003-12-23 04:49:04 +00:00
rtr 79dcbec3a2 sparc64:
CPPFLAGS+=	-UXF86VIDMODE -UXF86VIDMODE -UXF86DRI -D__GLX_ALIGN64
2003-12-23 04:45:08 +00:00
rtr 3314ec2745 sparc64:
CPPFLAGS+=	-UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
		-UXF86DRI -UXF86BIGFONT
2003-12-23 04:43:04 +00:00
rtr 9a6c868096 sparc64:
CPPFLAGS.miinitext.c+=   -UXF86MISC -UXINPUT -UXF86VIDMODE -UXFreeXDGA
CPPFLAGS.miscrinit.c+=   -UXF86MISC -UXINPUT -UXF86VIDMODE -UXFreeXDGA
2003-12-23 04:41:06 +00:00
rtr 21e69c48c2 DGA sources for sparc64 2003-12-23 04:07:15 +00:00
rtr 7408b6e072 libfontbase.a for XFree86 xserver. 2003-12-23 03:36:44 +00:00
rtr bc52e88390 add {DP,LD}ADD vars used by XFree86 2003-12-23 03:36:01 +00:00
rtr 45fc63a756 Fix up LDADD and DPADD for recent Xserver/* changes. 2003-12-23 03:33:41 +00:00
rtr 45180d05db libxf86config.a for XFree86 xserver. 2003-12-23 03:07:34 +00:00
rtr 027104741c build afbmodule.c if loadable 2003-12-22 16:20:46 +00:00
rtr 59346204f5 liblayer.a & libshadow.a modules for XFree86 xservers that require them. 2003-12-22 16:18:19 +00:00
rtr 81a20282e7 libafb.a module for xservers that require it. 2003-12-22 16:08:56 +00:00
rtr 72f8456f3a sparc64:
link libxinput.a into xserver
2003-12-22 15:57:51 +00:00
rtr fe50419a3b libloader.a for XFree86 xserver. 2003-12-22 15:45:57 +00:00
rtr a3337cecf6 libint10.a module for XFree86 xserver. 2003-12-22 14:25:33 +00:00
rtr cbb57af4d9 libramdac.a module for XFree86 xserver. 2003-12-22 14:21:11 +00:00
rtr 403f5a1255 libvbe.a module for XFree86 xserver. 2003-12-22 14:15:05 +00:00
rtr 8a86fb98e3 for macppc:
COPTS.xkbUtils.c=       -Wno-error
2003-12-22 14:07:08 +00:00
rtr 24f6c5b855 libdde.a module for XFree86 xserver. 2003-12-22 13:54:13 +00:00
rtr dc24121149 libvgahw.a module for XFree86 xserver. 2003-12-22 13:50:34 +00:00
rtr 43945597ef libpcidata.a module for XFree86 xserver. 2003-12-22 13:44:57 +00:00
rtr 4545246f3b libxf86_os.a needed to link XFree86 xserver. 2003-12-22 13:27:48 +00:00
rtr f5cc483a22 libxf86.a needed to link XFree86 xserver. 2003-12-22 13:18:47 +00:00
rtr 88d43392dd libxaa.a module for XFree86 xserver. 2003-12-22 13:16:07 +00:00
rtr befda77a06 libi2c.a module for XFree86 xserver. 2003-12-22 13:13:53 +00:00
mrg dcb198e155 for sparc64:
CPPFLAGS.sunGX.c=               -Wno-error
2003-12-21 13:07:50 +00:00
mrg a7b8bfbf90 for sparc64:
CPPFLAGS.fbbltone.c=    -Wno-error
2003-12-21 13:07:01 +00:00
rtr f7c5e08a26 GLcoremodule.c is used for module only. 2003-12-21 11:12:32 +00:00
rtr 12c87cdca3 Separate loadable modules
Don't build or install modules for non-loadable xservers
2003-12-21 03:07:01 +00:00
rtr 7dc2749ff7 Use mkg3states from x11/tools. 2003-12-20 12:56:24 +00:00
rtr b861af2572 SUBDIRS+= Xfont lbxutil 2003-12-20 01:39:31 +00:00
rtr 2ff6963aa7 sparc xservers, Xsun{,24,Mono} 2003-12-20 01:38:00 +00:00
rtr 78865e59e2 Xfont & lbxutil added for sparc xservers. 2003-12-20 01:36:22 +00:00
rtr 180e243936 libsun.a for sparc, needed for Xsun{24,Mono} xservers. 2003-12-20 01:32:06 +00:00
rtr 949c2b3550 SRCS+= miinitext.c
CPPFLAGS.miinitext.c+=	-UXF86MISC
for sparc
2003-12-20 01:29:29 +00:00
rtr b28ce06e12 Separate liblbxutil.a for Xserver. 2003-12-20 01:27:06 +00:00
rtr a1eaaf131d Separate libXfont.a for Xserver builds. 2003-12-20 01:25:42 +00:00
rtr f3a83e22d9 Do not always pass module defines. 2003-12-19 15:23:43 +00:00
rtr 9aeada1f8f Explicitly define -DXINPUT for sparc. 2003-12-19 14:13:03 +00:00
lukem 26be73f2a5 use X11FLAGS.OS_DEFINES 2003-11-17 05:18:20 +00:00
lukem f27dcca7c9 fix previous so that it actually works 2003-11-10 02:35:24 +00:00
lukem 8a6b8a5e46 Only run LIBDIR.${_SL}!= if it isn't defined, and add it to .MAKEOVERRIDES.
Noticably improves make's performance when traversing this subtree...
2003-10-24 14:50:51 +00:00
itojun fa4e8e1f23 -DHAVE_ARC4RANDOM for auth.c 2003-10-03 00:13:39 +00:00
lukem 5161639fb6 set -Wno-error on a few more files for gcc 3.3.
(they're technically bugs in XFree, but we'll wait until 4.4.x before
trying to fix them locally)
2003-09-30 09:49:29 +00:00
lukem 2961308e81 only pull in -li386 if ${MACHINE_ARCH} == "i386".
(noticed during a cross-compile from i386 to alpha.  funny that ;-)
2003-09-30 09:45:29 +00:00
lukem 06b22cf0b9 Use '${DESTDIR}${somepathvar}' instead of '${DESTDIR}/${somepathvar}'.
Suggested by Matt Thomas.
2003-09-30 06:41:29 +00:00
lukem 629c269f75 remove unnecessary .include 2003-09-24 01:55:06 +00:00
lukem 08b458c671 various improvements:
* build & install Xserver modules
* tweak for building with gcc 3.3.x
* rework for recent <bsd.x11.mk> rototill (moving it before other
  bsd.*.mk includes)
* remove libc_wrapper.o from libos.a, and explicitly link in where required
2003-09-23 23:21:02 +00:00
lukem 9c437ec754 Change `LNFILES' to `BUILDSYMLINKS', to more accurately describe its purpose.
Per discussion with Simon Gerraty.
2003-09-20 06:20:41 +00:00
lukem 81bdc1a00c bsd.x11.mk before bsd.lib.mk 2003-09-19 18:32:41 +00:00
lukem e214d537fb Rework to include <bsd.x11.mk> before all other <bsd.*.mk> _except_
<bsd.own.mk>, as we now set BINDIR,LIBDIR,MANDIR in <bsd.x11.mk>
rather than using a hierarchy of Makefile.inc files just to include
x11/Makefile.inc to get those variables.
2003-09-13 20:17:57 +00:00
lukem 280140f7c8 simplify; these don't need bsd.own.mk or bsd.x11.mk 2003-09-13 07:03:25 +00:00
lukem fd2c85e985 Imakeicide-II: reach-over makefile infrastructure to build XFree86 4.x
(from /usr/xsrc) using bsd-style Makefiles.
Why?
    -	sane cross building
    -	easy builds from read only source
    -	non-root building
    -	imake is evil
nuff said.
2003-09-12 02:49:56 +00:00
lukem 98ad6e84d6 Imakeicide-II: reach-over makefile infrastructure to build XFree86 4.x
(from /usr/xsrc) using bsd-style Makefiles.
Why?
    -	sane cross building
    -	easy builds from read only source
    -	non-root building
    -	imake is evil
nuff said.
2003-09-11 18:37:05 +00:00