Commit Graph

25 Commits

Author SHA1 Message Date
dbj 6d0e34acbf avoid objdir case conflicts for lib/xkbfile/xkbmisc.c and lib/X11/XKBMisc.c
by creating xkbfile-xkbmisc.c which includes lib/xkbfile/xkbmisc.c
2006-09-11 22:13:51 +00:00
lukem 09f1052592 Revert previous; it's unnecessary in light of Christos' fix to
pswfile.c rev 1.2.  It also may have a  make -j  race.

Explicitly use  -f ${.TARGET:.c=.h}  in .psw.c; it can't hurt and
it mirrors what XFree86 does.
2005-03-20 23:49:06 +00:00
rtr 5f073846f4 pswrap tool usage change 2005-03-20 23:11:19 +00:00
christos cc19f24e9f Adjust for the latest XFree86 import. Code now compiles, but libraries
might be incomplete and sets are definitely still broken.
2005-03-19 21:41:58 +00:00
lukem 8a1597d78b Fix up botches in X userland from upgrade from XFree86 4.3.0 -> 4.4.0.
(All paths are relative to usr/X11R6)

* Obsolete:
	bin/fontconfig-config

* Add directories:
	lib/X11/locale/zh_CN.UTF-8
	lib/X11/xkb/geometry/ibm

* Rename include/freetype2/ft2build.h to include/ft2build.h and obsolete former

* Add files:
	fonttosfnt(1) program & man page
	include/expat.h
	lib/X11/app-defaults/XClock-color
	lib/X11/fonts/TTF/Vera*.ttf
	some font encodings
	zn_CN.UTF-8 locale
	some font encodings
	various xkb config files
	lib/X11/xedit/lisp/progmodes/patch.lsp
	Xfontcache(3) and various links
	XDGA(3) and various links
	XRes(3) and various links
	Xss(3) and various XScreenSaver*(3) links

* Add some more TODO items

* Clean up lib/expat build now that the version is hard coded.
2004-04-28 14:17:55 +00:00
dbj 6eaa37b67d add -DDARWIN_NO_CARBON to HOST_CPPFLAGS so that cross build on macos
will not attempt to use mac specific resource fork font support.
2004-04-12 15:41:27 +00:00
dbj 323c238021 remove DPADD=${LIBZ}, since a host tool should not depend on /usr/lib/libz.a
even if it is using the system libz
2004-04-12 03:11:00 +00:00
rtr 542451dd14 use native libz
patch from Krister Walfridsson via pr#24783
2004-03-15 00:39:31 +00:00
rtr 61ba4636ab + update reachover host tools for xf4.4 2004-03-06 02:55:20 +00:00
lukem d8b3c89d68 consistently provide a tools/<tool>/Makefile.<tool> for inclusion
wherever the appropriate definitions are used throughout the tree
2004-02-09 04:30:05 +00:00
lukem dfdc761429 more explanation of the requirements 2004-02-09 00:47:16 +00:00
lukem 70f9fd7e61 Build makestrs earlier.
This isn't strictly necessary for build requirements, but does serve
to highlight that makestrs & pswrap are both needed early in the build.
2004-02-08 21:53:53 +00:00
lukem add50bbb4c makestrs is used to generate files for the "includes" path, so it can't
rely upon ${DESTDIR}${X11INCDIR} being populated.
Fixes problem observed using make -j.
2004-02-08 21:52:30 +00:00
lukem 7571144c87 add TNF copyright. remove unnecessary cruft 2004-02-08 21:25:09 +00:00
rtr ae158be0af move gen_matypes to x11/tools as per discussion with lukem and request
in post http://mail-index.NetBSD.org/tech-x11/2004/02/04/0001.html
2004-02-07 04:19:29 +00:00
rtr 1655ce4df5 Move host too makestrs to x11/tools as per discussion with lukem and
request in post http://mail-index.NetBSD.org/tech-x11/2004/02/04/0001.html
2004-02-07 04:02:01 +00:00
dbj 3bae198909 add -DDARWIN_NO_CARBON to HOST_CPPFLAGS so that cross build
on darwin does not try to use resource fork font support
which requires the carbon libraries.
2004-01-15 13:47:05 +00:00
rtr 2083c96e57 add mkg3states as host tool 2003-12-20 12:55:01 +00:00
lukem a9c9ec0e6e Support MAKEVERBOSE 2003-11-08 13:57:29 +00:00
lukem 06b22cf0b9 Use '${DESTDIR}${somepathvar}' instead of '${DESTDIR}/${somepathvar}'.
Suggested by Matt Thomas.
2003-09-30 06:41:29 +00:00
matt 21b18140ed Add -I${X11SRCDIR.xc}/config/${HOSTPROG} 2003-09-30 05:58:56 +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 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 2be62157bb Make fc-cache a host tool. 2003-09-12 18:52:57 +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