diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-03 22:23:37 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-04 10:52:52 +0100 |
| commit | 4a6c3d2ed2615a0004534359a261f4ec9d5cc826 (patch) | |
| tree | 4b6348dd44406a2d368cbe40294c9d4e26074724 /rules/fontconfig.make | |
| parent | 239d1604d9c690edeb7ffdfea3ce43fb4d46871b (diff) | |
| download | ptxdist-4a6c3d2ed2615a0004534359a261f4ec9d5cc826.tar.gz ptxdist-4a6c3d2ed2615a0004534359a261f4ec9d5cc826.tar.xz | |
[fontconfig] cleanup makefile
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/fontconfig.make')
| -rw-r--r-- | rules/fontconfig.make | 38 |
1 files changed, 13 insertions, 25 deletions
diff --git a/rules/fontconfig.make b/rules/fontconfig.make index 5b2862ddb..c8192b3a9 100644 --- a/rules/fontconfig.make +++ b/rules/fontconfig.make @@ -52,20 +52,13 @@ FONTCONFIG_AUTOCONF := \ --with-default-fonts=$(XORG_FONTDIR) \ --with-arch=$(PTXCONF_ARCH_STRING) -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/fontconfig.compile: - @$(call targetinfo) - # - # parallel build is broken: in fc-case/, two header files are generated. - # It *should* work, because the generated files are marked with BUILT_SOURCES, - # so they should be built before any other target. However, we've seen cases - # where the touch happened *after* fc-case.c was compiled -> bang - # - cd $(FONTCONFIG_DIR) && $(FONTCONFIG_PATH) $(MAKE) $(PARALLELMFLAGS_BROKEN) - @$(call touch) +# +# parallel build is broken: in fc-case/, two header files are generated. +# It *should* work, because the generated files are marked with BUILT_SOURCES, +# so they should be built before any other target. However, we've seen cases +# where the touch happened *after* fc-case.c was compiled -> bang +# +FONTCONFIG_MAKE_PAR := NO # ---------------------------------------------------------------------------- # Target-Install @@ -79,12 +72,11 @@ $(STATEDIR)/fontconfig.targetinstall: @$(call install_fixup,fontconfig,PRIORITY,optional) @$(call install_fixup,fontconfig,VERSION,$(FONTCONFIG_VERSION)) @$(call install_fixup,fontconfig,SECTION,base) - @$(call install_fixup,fontconfig,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,fontconfig,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup,fontconfig,DEPENDS,) @$(call install_fixup,fontconfig,DESCRIPTION,missing) - @$(call install_copy, fontconfig, 0, 0, 0644, \ - $(FONTCONFIG_DIR)/src/.libs/libfontconfig.so.1.3.0, \ + @$(call install_copy, fontconfig, 0, 0, 0644, -, \ /usr/lib/libfontconfig.so.1.3.0) @$(call install_link, fontconfig, \ @@ -96,8 +88,7 @@ $(STATEDIR)/fontconfig.targetinstall: /usr/lib/libfontconfig.so) ifdef PTXCONF_FONTCONFIG_CONFS - @$(call install_copy, fontconfig, 0, 0, 0644, \ - $(FONTCONFIG_DIR)/fonts.conf, \ + @$(call install_copy, fontconfig, 0, 0, 0644, -, \ /etc/fonts/fonts.conf,n) # @$(call install_copy, fontconfig, 0, 0, 0644, \ @@ -110,16 +101,13 @@ ifdef PTXCONF_FONTCONFIG_CONFS endif ifdef PTXCONF_FONTCONFIG_UTILS - @$(call install_copy, fontconfig, 0, 0, 0755, \ - $(FONTCONFIG_DIR)/fc-cache/fc-cache, \ + @$(call install_copy, fontconfig, 0, 0, 0755, -, \ /usr/bin/fc-cache) - @$(call install_copy, fontconfig, 0, 0, 0755, \ - $(FONTCONFIG_DIR)/fc-list/fc-list, \ + @$(call install_copy, fontconfig, 0, 0, 0755, -, \ /usr/bin/fc-list) - @$(call install_copy, fontconfig, 0, 0, 0755, \ - $(FONTCONFIG_DIR)/fc-match/fc-match, \ + @$(call install_copy, fontconfig, 0, 0, 0755, -, \ /usr/bin/fc-match) endif |