diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-03 19:12:49 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-03 19:12:49 +0000 |
| commit | 08c60ab83de4b675b8852190da0d48fc93944e6f (patch) | |
| tree | 273ae49293fec799971070a5bd36642e4446f823 /graphics/xpm | |
| parent | c85165ac0786a6271c5e08213cf55d5cb30c803f (diff) | |
| download | pkgsrc-08c60ab83de4b675b8852190da0d48fc93944e6f.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 'graphics/xpm')
| -rw-r--r-- | graphics/xpm/builtin-imake.mk | 12 | ||||
| -rw-r--r-- | graphics/xpm/builtin.mk | 17 |
2 files changed, 4 insertions, 25 deletions
diff --git a/graphics/xpm/builtin-imake.mk b/graphics/xpm/builtin-imake.mk deleted file mode 100644 index b4ac4fdec4c..00000000000 --- a/graphics/xpm/builtin-imake.mk +++ /dev/null @@ -1,12 +0,0 @@ -XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:02:58 jlam Exp $ - -/* - * Check the value of NormalLibXpm for the presence of Xpm - * in the X11 distribution. - */ -builtin-test: -#if NormalLibXpm - @echo yes -#else - @echo no -#endif diff --git a/graphics/xpm/builtin.mk b/graphics/xpm/builtin.mk index cdf9d3d0ccd..277e9727234 100644 --- a/graphics/xpm/builtin.mk +++ b/graphics/xpm/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.9 2005/06/03 17:02:36 jlam Exp $ +# $NetBSD: builtin.mk,v 1.10 2005/06/03 19:12:49 jlam Exp $ BUILTIN_PKG:= xpm @@ -24,18 +24,9 @@ IS_BUILTIN.xpm!= \ . elif ${OPSYS} == "IRIX" IS_BUILTIN.xpm= yes . else -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.xpm!= \ - dir=`cd ${BUILDLINK_PKGSRCDIR.xpm} && ${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:= xpm:NormalLibXpm +. include "../../mk/buildlink3/imake-check.mk" +IS_BUILTIN.xpm= ${BUILTIN_IMAKE_CHECK.xpm} . endif . endif .endif |