diff options
| author | jlam <jlam> | 2005-06-03 19:12:49 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-06-03 19:12:49 +0000 |
| commit | b21f057e470adb863435dc41a0293a76a45ee0ee (patch) | |
| tree | 273ae49293fec799971070a5bd36642e4446f823 /x11/Xcomposite | |
| parent | 9c7cc0611bcb93ada5bcf2b92bb15f59ae940350 (diff) | |
| download | pkgsrc-b21f057e470adb863435dc41a0293a76a45ee0ee.tar.gz | |
Coalesce the common makefile code in the builtin.mk file that inspect
the X11 distribution using imake into mk/buildlink3/imake-check.mk.
imake-check.mk calls out to a helper shell script mk/buildlink3/imake-check
that generates the required Imakefiles and runs imake. Remove the
now extraneous builtin-imake.mk files as the builtin.mk files can now
contain the name of the imake symbol to check.
Diffstat (limited to 'x11/Xcomposite')
| -rw-r--r-- | x11/Xcomposite/builtin-imake.mk | 12 | ||||
| -rw-r--r-- | x11/Xcomposite/builtin.mk | 17 |
2 files changed, 4 insertions, 25 deletions
diff --git a/x11/Xcomposite/builtin-imake.mk b/x11/Xcomposite/builtin-imake.mk deleted file mode 100644 index 30158e304ca..00000000000 --- a/x11/Xcomposite/builtin-imake.mk +++ /dev/null @@ -1,12 +0,0 @@ -XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $ - -/* - * Check the value of BuildCompositeLibrary for the presence of - * Xcomposite in the X11 distribution. - */ -builtin-test: -#if BuildCompositeLibrary - @echo yes -#else - @echo no -#endif diff --git a/x11/Xcomposite/builtin.mk b/x11/Xcomposite/builtin.mk index 24087d80b12..53c51ee2e04 100644 --- a/x11/Xcomposite/builtin.mk +++ b/x11/Xcomposite/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.8 2005/06/03 17:02:36 jlam Exp $ +# $NetBSD: builtin.mk,v 1.9 2005/06/03 19:12:49 jlam Exp $ BUILTIN_PKG:= Xcomposite @@ -15,18 +15,9 @@ BUILTIN_FIND_FILES.H_XCOMPOSITE= \ .if !defined(IS_BUILTIN.Xcomposite) IS_BUILTIN.Xcomposite= no . if exists(${H_XCOMPOSITE}) -PKGSRC_USE_TOOLS+= imake # XXX -IMAKE?= ${X11BASE}/bin/imake # XXX -_BUILTIN_IMAKE_CMD= ${IMAKE:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//} -. if exists(${_BUILTIN_IMAKE_CMD}) -IS_BUILTIN.Xcomposite!= \ - dir=`cd ${BUILDLINK_PKGSRCDIR.Xcomposite} && ${PWD_CMD}`; \ - cd ${TMPDIR:U/tmp:Q} && \ - ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ - -f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c \ - -s - | \ - ${IMAKE_MAKE} -f - builtin-test -. endif +BUILTIN_IMAKE_CHECK:= Xcomposite:BuildCompositeLibrary +. include "../../mk/buildlink3/imake-check.mk" +IS_BUILTIN.Xcomposite= ${BUILTIN_IMAKE_CHECK.Xcomposite} . endif .endif MAKEVARS+= IS_BUILTIN.Xcomposite |