Commit Graph

498 Commits

Author SHA1 Message Date
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