diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-01-06 22:01:31 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-01-06 22:02:31 +0100 |
| commit | 11e79705d132e2fcfc95eec468f4d4289578ff63 (patch) | |
| tree | 1c0edb542953888b8433212c67e1b25a793974f8 | |
| parent | a6d6e5d04cbbfa63f477658186702eb5d11689fe (diff) | |
| download | ptxdist-11e79705d132e2fcfc95eec468f4d4289578ff63.tar.gz ptxdist-11e79705d132e2fcfc95eec468f4d4289578ff63.tar.xz | |
Revert "xorg-fonts: generate fonts.dir etc. only if Xorg is used"
This reverts commit 245d147ce8030684a50ac6bc5e34fefad517a807.
It's not that easy. Some of this is needed anyways. And there are
configure checks for the rest.
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, 7 insertions, 13 deletions
diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in index b4ce36b3c..3124cd37a 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_FONTS_XORG + select XORG_LIB_XFONT_PCF_FONTS if XORG_SERVER default y if XORG_SERVER help These fonts can be used with an x-server, standalone directfb or @@ -15,19 +15,15 @@ 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 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 + 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 config XORG_FONTS_QT4_LINKS depends on QT4_PLATFORM_EMBEDDED diff --git a/rules/xorg-fonts.make b/rules/xorg-fonts.make index 50f4c8e38..83553de17 100644 --- a/rules/xorg-fonts.make +++ b/rules/xorg-fonts.make @@ -49,7 +49,6 @@ $(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 \ @@ -65,7 +64,6 @@ ifdef PTXCONF_XORG_FONTS_XORG mkfontdir $${dir} ;; \ esac; \ done -endif # FIXME: add fc-cache? |