diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-03 09:16:19 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-03 09:16:19 +0100 |
| commit | 17464545a9abdd19312065a578d1f69a6b0b015f (patch) | |
| tree | d39fde94a445ddde95399d4850ffbbbd357a3a19 /fontconfig/fc-glyphname | |
| parent | eba14241fe23d0561687a1e530a57fa0bfc6ab69 (diff) | |
| parent | b8da71ffb17d3d16706db04115e9ba1dd8bc49b9 (diff) | |
| download | vcxsrv-17464545a9abdd19312065a578d1f69a6b0b015f.tar.gz vcxsrv-17464545a9abdd19312065a578d1f69a6b0b015f.tar.bz2 vcxsrv-17464545a9abdd19312065a578d1f69a6b0b015f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012
Diffstat (limited to 'fontconfig/fc-glyphname')
| -rw-r--r-- | fontconfig/fc-glyphname/Makefile.am | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fontconfig/fc-glyphname/Makefile.am b/fontconfig/fc-glyphname/Makefile.am index fdba146c9..e33b3ba6a 100644 --- a/fontconfig/fc-glyphname/Makefile.am +++ b/fontconfig/fc-glyphname/Makefile.am @@ -40,7 +40,10 @@ if CROSS_COMPILING $(TARG): $(STMPL) fc-glyphname.c $(SGLYPHNAME) @echo Warning: cannot rebuild $(TARG) when cross-compiling else -$(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME) +## BUILT_SOURCES doesn't effect to 'distcheck' +## so $(ALIAS_FILES) has to be appeared prior to fc-glyphname$(EXEEXT) +## to make sure availability. +$(TARG): $(STMPL) $(ALIAS_FILES) fc-glyphname$(EXEEXT) $(SGLYPHNAME) $(AM_V_GEN) $(RM) $(TARG); \ ./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \ mv $(TARG).tmp $(TARG) @@ -48,10 +51,10 @@ endif ALIAS_FILES = fcalias.h fcaliastail.h -BUILT_SOURCES = $(ALIAS_FILES) $(TARG) +BUILT_SOURCES = $(ALIAS_FILES) $(ALIAS_FILES): - touch $(ALIAS_FILES) + $(AM_V_GEN) touch $@ CLEANFILES = $(ALIAS_FILES) |