Commit Graph

434 Commits

Author SHA1 Message Date
lukem
b5b40b6c35 Define CHOOSERPATH to /usr/X11R6/libexec/chooser, and use appropriately. 2004-01-02 17:19:51 +00:00
lukem
ac0037bc31 Don't bother with local (custom) version of rstartd.cpp; go back to
using server.cpp from the xsrc/xfree dist directory, because I've
modified the latter to allow a separate BINDIR from LIBDIR.
2004-01-02 16:38:14 +00:00
lukem
4c6d23c4a8 Provide custom version of rstartd.cpp that supports a BINDIR
(for rstartd.real) separate to the LIBDIR (for the configuration)
and install rstartd.real into /usr/X11R6/libexec.
(Installing binaries under /usr/X11R6/lib/X11 (which may be a
symlink to /etc/X11) is Bad.0

Override BINDIR after the .include of <bsd.own.mk>, so that rstartd.real
is installed in the correct location.
2004-01-02 16:32:12 +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
grant
cb6082b85b indent a nested .for, whitespace cleanup. 2003-12-23 05:02:42 +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
e795b43a2f hw/sun in tree -- update TODO 2003-12-22 14:33:54 +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
2956930d9f build the assembler files on sparc64 2003-12-22 12:45:21 +00:00
rtr
886f56e61b made mkg3states a host tool so update TODO 2003-12-22 10:53:26 +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
8b6c9e129e Use mkg3states from x11/tools, instead of specifically building it. 2003-12-20 12:56:00 +00:00
rtr
2083c96e57 add mkg3states as host tool 2003-12-20 12:55:01 +00:00
rtr
a1458eba14 mkg3states moved to x11/tools since it's a host prog used in more than
one place.
2003-12-20 12:54:15 +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
9bff69894e Use arc4random in genauth.c 2003-12-20 01:22:39 +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
a9c9ec0e6e Support MAKEVERBOSE 2003-11-08 13:57:29 +00:00
matt
2e6ccf08b6 Honor NOINCLUDES= environment variable. 2003-11-02 23:46:02 +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
jdolecek
5207acb8cf build shared version of libXss too 2003-10-24 13:10:53 +00:00
jdolecek
36273fe84e build shared libFS, libXdmcp, libXinerama, libXxf86dga, libXxf86vm
follows recent change in xsrc (and XFree-current)
2003-10-20 05:12:40 +00:00
jdolecek
0c65d17f6e build shared xkbfile and xkbui libraries; follows the change to xsrc 2003-10-20 05:02:31 +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
98cb2b51cf clarify which bits of xserver we are most interested in 2003-09-30 06:39:09 +00:00
matt
21b18140ed Add -I${X11SRCDIR.xc}/config/${HOSTPROG} 2003-09-30 05:58:56 +00:00
lukem
f6d1cf4493 enable Xserver build. (not everything is working yet, including hw/xfree86) 2003-09-24 01:56:57 +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
5906faf133 Explicitly add -I/path/to/dist/src so that any yacc-generated .c files
in the .OBJDIR compile correctly.

(Something I changed in the last commit must have broken this.
Or make(1) changed.  Or something else borked.  In any case, it's fixed now.)
2003-09-23 11:04:45 +00:00
lukem
e2d7cbd438 Explicitly do the NOLINT/NOPIC/NOPROFILE/libinstall:: dance in each Makefile.
XXX: really need a single knob in bsd.lib.mk to enable this.  we could
use it in many many places in the tree
2003-09-23 11:02:46 +00:00
lukem
a57640993c need -lstdc++ -lm for -lGLU.
(even though the latter is linked against the former two, that technique
doesn't help for static programs nor does it appear to work consistently)
2003-09-23 11:01:20 +00:00
lukem
cd4a914224 use COPTS(|.file.c)=-Wno-error to work around the gcc 3.3 warning:
``warning: comparison is always true due to limited range of data type''
2003-09-23 10:59:18 +00:00
lukem
64e2842be9 need libstdc++ libm with g++ 3.3 2003-09-23 10:57:40 +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
35ad9c6a4a Add more utils from config/*:
ccmakedep cleanlinks gccmakedep makedepend makeg makestrs mergelib
	mkdirhier mkhtmlindex revpath rman

Even though this build doesn't need them, other programs that use
imake (et al) may need them.
2003-09-15 08:31:01 +00:00
lukem
bfebf9d8fd don't build glx* on vax until libm has some missing stuff added 2003-09-14 22:33:31 +00:00
lukem
f524faec9a revert previous and use INCS{,DIR} here; some programs include these
bitmaps directly and therefore need them after "includes" and not
after "install" time...
2003-09-14 18:09:30 +00:00
lukem
63e0f38853 remove a bunch of stuff i have fixed 2003-09-14 07:58:17 +00:00
lukem
76208c68fd Split build of libX11 into:
static	libX11.a libX11_p.a libX11.ln
	dynamic	libX11_pic.a libX11.so*
This is because the "static" build needs some different sources to the
"dynamic" build, and some of the shared sources in the "dynamic" build
need different CPPFLAGS for that build.
2003-09-14 07:56:16 +00:00
lukem
bb99d06da2 remove superfluous "XTODO" comments 2003-09-14 07:11:06 +00:00
lukem
b91e258047 move i386 specific sources into .if ${MACHINE_ARCH} == "i386", and
add sparc specific sources into .if ${MACHINE_ARCH} == "sparc"
2003-09-14 07:06:32 +00:00
lukem
6a44df7639 add ssh-askpass and xsystrace (from xsrc/local/programs) 2003-09-14 06:42:23 +00:00
lukem
37d0fff499 use FILES{,DIR} instead of INCS{,DIR} for bitmaps 2003-09-14 06:36:59 +00:00
lukem
85672e8877 Don't rely upon -lXmuu's internal dependancy upon -lXt -lSM -lICE and
link these explicitly.  Why:
    -	on my main system i get intermittent link errors with ICE and Xt
    	missing various libc symbols with the implicit link of these libs
    -	it also works for static linking
2003-09-13 21:50:50 +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
3b11a872a6 be explicit about a couple of XTODO items 2003-09-13 20:15:55 +00:00
lukem
48ca162b40 don't need bsd.obj.mk here 2003-09-13 20:11:38 +00:00
lukem
aa1da75dba remove commented-out cruft that has been mvoed to Makefile.makekeys 2003-09-13 19:12:01 +00:00
lukem
b8a9db92ee do not need bsd.own.mk or bsd.x11.mk here 2003-09-13 07:21:52 +00:00
lukem
8db3794467 do not need bsd.own.mk or bsd.x11.mk here 2003-09-13 07:11:36 +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
1cd595964e sanitise use of ${DESTDIR}${SOMEOTHERVAR} 2003-09-13 00:24:51 +00:00
lukem
b8ac3adb72 run fc-cache -fv to build the `fonts.cache-1' files 2003-09-13 00:19:57 +00:00
lukem
1460f0fc35 only add to the METALOG if ${MKUNPRIVED} != "no" 2003-09-12 19:00:14 +00:00
lukem
2be62157bb Make fc-cache a host tool. 2003-09-12 18:52:57 +00:00
lukem
e2e6a041ad need <bsd.own.mk> before checking MKSHARE ... 2003-09-12 18:38:31 +00:00
lukem
70330f9615 Move version definitions (etc) into separate Makefile.expatdefs,
so that other Makefiles can use them
2003-09-12 18:24:20 +00:00
lukem
80a5271b2a support MKSHARE=no in share/ 2003-09-12 16:27:27 +00:00
lukem
b6a86c38d2 Enable dependencies on other libraries as necessary.
(Should have been fixed before initial import - oops! :)
2003-09-12 08:08:09 +00:00
lukem
0843b985d1 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 07:47:26 +00:00
lukem
2854e6f642 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 04:43:18 +00:00
lukem
f36d03c7f7 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 03:06:13 +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
ad067916f5 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:39:49 +00:00
lukem
f237492d35 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 19:26:34 +00:00
lukem
dee68537c2 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:55:44 +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