diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-03-25 23:41:51 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-03-25 23:41:51 +0000 |
| commit | 28a817eb7db2b6e503c2664c7d3683be0e3ce5f3 (patch) | |
| tree | 6ce16dcf1a00f9d4a692ea93e91d6258a79c3316 /app/Makefile | |
| parent | d0296cb2dca77008ac87984bf5fff52ca809195d (diff) | |
Introduce bsd.xconf.mk to set default config variables used
at several places in the Xenocara build in a central place instead
of duplicating the checks all over the place. ok oga@.
Diffstat (limited to 'app/Makefile')
| -rw-r--r-- | app/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/Makefile b/app/Makefile index aa30c9688..01c18a2b0 100644 --- a/app/Makefile +++ b/app/Makefile @@ -1,4 +1,5 @@ -# $OpenBSD: Makefile,v 1.14 2008/02/21 08:04:44 todd Exp $ +# $OpenBSD: Makefile,v 1.15 2008/03/25 23:41:50 matthieu Exp $ +.include <bsd.xconf.mk> SUBDIR= bdftopcf mkfontscale mkfontdir \ appres beforelight bitmap editres fonttosfnt fslsfonts \ @@ -16,13 +17,12 @@ SUBDIR= bdftopcf mkfontscale mkfontdir \ xwud # Font server doesn't link on architectures with static only libraries -.if ${MACHINE} != landisk && ${MACHINE} != "vax" && ${MACHINE_ARCH} != "m88k" +.if ${XENOCARA_HAVE_SHARED_LIBS:L} == "yes" SUBDIR += xfs .endif # GL -.if ${MACHINE} != "sgi" && ${MACHINE} != "vax" && ${MACHINE_ARCH} != "m88k" \ - && ${MACHINE} != "landisk" +.if ${XENOCARA_BUILD_GL:L} == "yes" SUBDIR += xdriinfo glxgears glxinfo .endif |