Commit Graph

78 Commits

Author SHA1 Message Date
abs 328961279a Convert more MACHINE tests to MACHINE_ARCH so it is more obvious what
could be sharable per MACHINE_ARCH. Again another selection of mixed
amd64/x86_64 tests cleaned up, including one file which was testing
MACHINE for both!
2009-02-14 13:48:16 +00:00
apb f46c1de7cb Use ${TOOL_SED} instead if plain sed in Makefiles. 2008-10-25 22:27:34 +00:00
apb f3f295c281 Use ${TOOL_AWK} instead of ${AWK} or plain "awk" in make commands.
Pass AWK=${TOOL_AWK:Q} to shell scripts that use awk.
2008-10-19 22:05:23 +00:00
scw 5764a76889 Remove support for NetBSD/{,evb}sh5. 2007-04-08 09:35:21 +00:00
sketch b97206e347 Add missing closing brace. How did this ever work previously? 2006-04-21 21:46:06 +00:00
chs e211d606cd fix many problems in the reachover Makefiles for X11 libraries:
- add many missing shared-library dependencies
 - remove many unnecessary shared-library dependencies
 - add many missing files to the Mesa source list
 - fix the ordering of the SUBDIR list in the top level
   to match the actual inter-library dependencies
2005-09-24 13:51:46 +00:00
chs b8035c1db1 add a shared-lib dependency on libfreetype, since this library calls that one. 2005-09-22 15:42:57 +00:00
martin 9238421273 fontconfig depends on expat - so insert a .WAIT for parallel builds. 2005-07-22 08:47:20 +00:00
lukem 90cee22b7a Add back <bsd.lib.mk>, which Christos accidentally removed in the previous.
We need it for the LIBDPLIBS optimization to work.
2005-07-19 23:24:26 +00:00
christos bca552a90d PR/30413: Martin Husemann: make target ordering issue in non-compat mode.
This was caused by a problem in the Makefile.
2005-07-19 21:14:39 +00:00
martin 4f8a6aa79a We need ${X11FLAGS.EXTENSION} here, because it carries what xsrc calls
GlxExtraDefines - and those are very important on 64 bit archs at least
(-D__GLX_ALIGN64)
2005-05-14 19:27:56 +00:00
rtr 247dcd3422 + update .PATH for sparc clip.S
+ enable MIEXT_* by default since it is required by Xdmx and all archs
  build it

This makes -m sparc build src/x11
2005-03-22 19:47:59 +00:00
rtr 697d48d199 + libdmx dso
+ dmx example utils
2005-03-22 04:18:48 +00:00
tron 4e82d87220 Remove obsolete definition for "codeconv" modules which no longer exist. 2005-03-21 14:38:48 +00:00
tron 5313df498e Backout last change, "-fno-strict-aliasing" is now enable via "bsd.x11.mk". 2005-03-21 14:11:00 +00:00
tron 1d12c069e3 Compile this library with "-fno-strict-aliasing" to fix PR xsrc/29743
for the reachover build.
2005-03-21 13:55:25 +00:00
tron 95b5dcbdd0 The minor version of this library was bumped. 2005-03-21 09:03:12 +00:00
rtr a15a1d2d27 add missing freetype headers 2005-03-21 00:55:04 +00:00
rtr 54561084d0 add missing source files 2005-03-20 23:52:05 +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
rtr 8c050b7c06 + cleanup removal of -DUSE_NBSD_THREADLIB usage 2005-01-21 05:15:36 +00:00
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