diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-01-03 14:16:08 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-01-03 15:31:43 +0100 |
| commit | 245d147ce8030684a50ac6bc5e34fefad517a807 (patch) | |
| tree | f74574e44eb4ac889f5848fe643a785b0d372897 | |
| parent | 27468dae8774e65c75f058a500445a6d39af27ec (diff) | |
| download | ptxdist-245d147ce8030684a50ac6bc5e34fefad517a807.tar.gz ptxdist-245d147ce8030684a50ac6bc5e34fefad517a807.tar.xz | |
xorg-fonts: generate fonts.dir etc. only if Xorg is used
Other users, e.g. Qt Embedded don't need this.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/graphics_and_multimedia.in | 18 | ||||
| -rw-r--r-- | rules/xorg-fonts.make | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in index 3124cd37a..b4ce36b3c 100644 --- a/rules/graphics_and_multimedia.in +++ b/rules/graphics_and_multimedia.in @@ -7,7 +7,7 @@ endmenu menuconfig MENU_XORG_FONTS bool prompt "fonts " - select XORG_LIB_XFONT_PCF_FONTS if XORG_SERVER + select XORG_LIB_XFONT_PCF_FONTS if XORG_FONTS_XORG default y if XORG_SERVER help These fonts can be used with an x-server, standalone directfb or @@ -15,15 +15,19 @@ menuconfig MENU_XORG_FONTS if MENU_XORG_FONTS +config XORG_FONTS_XORG + bool + default XORG_SERVER + config XORG_FONTS depends on MENU_XORG_FONTS bool - select XORG_FONT_UTIL - select XORG_FONT_ALIAS - select HOST_XORG_APP_MKFONTDIR - select HOST_XORG_APP_MKFONTSCALE - select HOST_XORG_APP_BDFTOPCF - select HOST_XORG_FONT_UTIL + select XORG_FONT_UTIL if XORG_FONTS_XORG + select XORG_FONT_ALIAS if XORG_FONTS_XORG + select HOST_XORG_APP_MKFONTDIR if XORG_FONTS_XORG + select HOST_XORG_APP_MKFONTSCALE if XORG_FONTS_XORG + select HOST_XORG_APP_BDFTOPCF if XORG_FONTS_XORG + select HOST_XORG_FONT_UTIL if XORG_FONTS_XORG config XORG_FONTS_QT4_LINKS depends on QT4_PLATFORM_EMBEDDED diff --git a/rules/xorg-fonts.make b/rules/xorg-fonts.make index 83553de17..50f4c8e38 100644 --- a/rules/xorg-fonts.make +++ b/rules/xorg-fonts.make @@ -49,6 +49,7 @@ $(STATEDIR)/xorg-fonts.targetinstall: $(STATEDIR)/xorg-fonts.targetinstall.post: @$(call targetinfo) +ifdef PTXCONF_XORG_FONTS_XORG find $(XORG_FONTS_DIR_INSTALL) -mindepth 1 -type d | while read dir; do \ echo $$dir;\ case "$${dir}" in \ @@ -64,6 +65,7 @@ $(STATEDIR)/xorg-fonts.targetinstall.post: mkfontdir $${dir} ;; \ esac; \ done +endif # FIXME: add fc-cache? |