Commit Graph

57 Commits

Author SHA1 Message Date
lukem
b8d2105c21 Need to prefix relative directories with `${.CURDIR}/' so that
objdir builds in the src tree (i.e, without MAKEOBJDIR{,PREFIX}) work.
2004-08-05 01:28:47 +00:00
lukem
c36b0cda5a Cache .OBJDIRS of LIBDPLIBS commonly used in SUBDIRs,
to speed up recursive makes from this directory (or above).

Note: this uses MAKEOVERRIDES, and may need special treatment
for host platforms that have limits in this area.
2004-08-04 11:10:19 +00:00
lukem
f4b86cdac7 Convert from DPADD/LDADD to LIBDPLIBS (from bsd.lib.mk), which allows
libraries to be linked at other libraries that have been built but
not yet installed.
2004-08-04 08:37:04 +00:00
lukem
730b098c45 Add the .c and .h files generated from *.psw to DPSRCS.
Add -I. to CPPFLAGS.

This should fix a build problem highlighted by rtr@ in private mail.
2004-07-13 16:15:28 +00:00
lukem
10cfcae8fc Radically overhaul X11 configuration:
*	End user modifiable configuration has moved from
		/usr/X11R6/lib/X11/<someprog>
	to
		/etc/X11/<someprog>
	This is consistent with our own policies as well as other projects.

	The files & directories that were moved have _NOT_ been marked
	`obsolete', as they contain user configuration and therefore we
	don't want the automatic "obsolete file removal" mechanism to
	remove them.

    *	The /etc/font/* and /etc/X11/* configuration files are installed
	with 'configinstall' (not 'install'), using CONFIGFILES and
	CONFIGSYMLINKS.
	This is so that a normal 'make build' in src/x11 will not
	trash your configuration.

    *	A 'distribution' target has been added to src/x11 to perform
	'make configinstall' in the appropriate subdirectories.
	(Should we consider making 'configinstall' a first-class target?)

    * 	The xdm pixmaps have have been moved to /usr/X11R6/include/X11/pixmaps
	where the other pixmaps are.
	(I don't consider these pictures end-user configuration).


IMPORTANT NOTE:

    *	These changes require an up to date xsrc, and 'make cleandir' should
	be performed in src/x11 before a build for the changes to fully take
	effect.
2004-05-16 10:25:13 +00:00
he
7cf5573a11 Drop optmization to -O0 for sh5 for one file to work around an
internal compiler error.
2004-05-13 22:32:47 +00:00
lukem
d2df9b79b4 Sync to changes made in XFree86 4.4 and add -DXFREE86_FT2 appropriately. 2004-04-29 05:18:25 +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
lukem
f6c0266f4d Add -I${X11SRCDIR.xc}/lib/xtrans, -I${X11SRCDIR.xc}/lib/GL/glx, (etc)
as appropriate.
Based on fix from Hubert Feyrer, cross-checked with the native Imakefiles.
2004-04-05 12:03:25 +00:00
lukem
18923ab6c1 Add -DUSE_X86_ASM -I${X11SRCDIR.xc}/extras/Mesa/src/X86
to the global CPPFLAGS when building on i386.  Fix from Hubert Feyrer.
2004-04-05 12:01:42 +00:00
lukem
9e2ca4378e Add -I${X11SRCDIR.xc}/extras/expat/lib to CPPFLAGS.
Should fix problem Hubert Feyrer was experiencing.
2004-04-04 00:20:45 +00:00
perry
1743443686 Add a compile flag, MKTTINTERP, that turns on the bytecode interpreter
when it is set to yes (typically in /etc/mk.conf)

The freetype bytecode interpreter is not on by default because it is
patented in some jurisdictions.
2004-03-17 23:15:30 +00:00
rtr
00c7d78b79 + hardcode_libdir_flag_spec="-Wl,-rpath,${X11USRLIBDIR}" - for both *-config
scripts
+ FONTCONFIG_LIBS="-L${X11USRLIBDIR} -lfontconfig" for xft-config

patch from Kouichirou Hiratsuka should resolve pr#24751
2004-03-12 03:59:42 +00:00
rtr
020fb098d7 freetype/Makefile
+ substitute @hardcode_libdir_flag_spec@ with -Wl,-rpath,/usr/X11R6/lib
  + substitute @LIBZ@ with -lz
fontconfig/Makefile
  + substitute @hardcode_libdir_flag_spec@ with -Wl,-rpath,/usr/X11R6/lib

should resolve pr#24747

XXX native built xf 4.4 may suffer from the same problem
2004-03-11 16:13:30 +00:00
rtr
e1152a4b9b oops missed bump to 1.1 2004-03-06 15:32:33 +00:00
rtr
9db533ef43 + update reachover lib/* for xf4.4
XXX font/Makefile needs to be re-examined, but builds for now.
2004-03-06 03:05:39 +00:00
rtr
e1bbf3c9e0 + pre-build and install libexpat before lib/*
+ link libfontconfig w/ libexpat.

Should resolve pr#24527.
2004-02-23 05:47:47 +00:00
lukem
d51a64d931 clean up temporary files 2004-02-09 05:58:24 +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
7c22253779 remove ${STRINGS_FILES} explicitly (${.TARGET} changed) 2004-02-08 22:13:10 +00:00
lukem
0f8e01e903 When building multiple targets with a single series of commands
(e.g, a command builds multiple files), use a timestamp file for
synchronization so that "make -j" doesn't run those commands
multiple times in parallel which could result in data corruption.
2004-02-08 21:57:04 +00:00
rtr
81ec90969f Re add ${MAKESTRS} and ${GENMATYPES} targets with updated paths into objdir. 2004-02-07 05:47:19 +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
e062d16f1e remove MAKESTRS target 2004-02-07 04:15:33 +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
fredb
4d26570c37 Fix typo. 2004-02-06 16:41:28 +00:00
mrg
261537f309 only build xlibi18n if MKPIC != no. 2004-02-06 14:55:48 +00:00
lukem
5377e93afc don't bother installing XftConfig-OBSOLETE 2004-01-23 14:32:02 +00:00
lukem
e0d2e74a5d tweak some XTODO items 2004-01-10 23:35:55 +00:00
rtr
b87f955fb5 use prog.mk so we get cleandir. from jmmv@ 2004-01-08 09:49:24 +00:00
rtr
c5a3389d51 use ${HOST_SH} instead of sh 2004-01-08 04:45:12 +00:00
rtr
f2914ee88d pkg-config (pc) and -config scripts 2004-01-06 06:15:45 +00:00
rtr
73a679e1b3 true type includes 2004-01-05 12:14:04 +00:00
rtr
8176970043 shared lib versions for shared libs turned on in previous commit. 2004-01-05 04:32:38 +00:00
rtr
41b837f4b1 major version should be 6 not 1 2004-01-05 02:31:54 +00:00
rtr
e12de730ff Build shared versions of these libs. 2004-01-05 02:29:30 +00:00
mrg
2956930d9f build the assembler files on sparc64 2003-12-22 12:45:21 +00:00
rtr
8b6c9e129e Use mkg3states from x11/tools, instead of specifically building it. 2003-12-20 12:56:00 +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
lukem
a9c9ec0e6e Support MAKEVERBOSE 2003-11-08 13:57:29 +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
lukem
06b22cf0b9 Use '${DESTDIR}${somepathvar}' instead of '${DESTDIR}/${somepathvar}'.
Suggested by Matt Thomas.
2003-09-30 06:41:29 +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
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
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
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