Alexandre Julliard : makedep: Add phony install targets for fonts also for the ttf case.

Alexandre Julliard julliard at winehq.org
Wed Apr 2 13:35:15 CDT 2014


Module: wine
Branch: master
Commit: 6bfd2e9a75bf562996111d631bc1712b3e5dc9dd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6bfd2e9a75bf562996111d631bc1712b3e5dc9dd

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Apr  2 10:58:30 2014 +0200

makedep: Add phony install targets for fonts also for the ttf case.

---

 tools/makedep.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tools/makedep.c b/tools/makedep.c
index d878869..3be431a 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -1663,6 +1663,7 @@ static struct strarray output_sources(void)
                 output( "%s: %s\n", ttf_file, source->filename );
                 output( "\t%s -script %s %s $@\n",
                         fontforge, top_dir_path( "fonts/genttf.ff" ), source->filename );
+                if (!(source->flags & FLAG_SFD_FONTS)) output( "all: %s\n", ttf_file );
             }
             if (source->flags & FLAG_INSTALL)
             {
@@ -1687,13 +1688,14 @@ static struct strarray output_sources(void)
                     output( "\t$(INSTALL_DATA) %s $(DESTDIR)$(fontdir)/%s\n", font, font );
                     output( "uninstall::\n" );
                     output( "\t$(RM) $(DESTDIR)$(fontdir)/%s\n", font );
-                    strarray_add_uniq( &phony_targets, "install" );
-                    strarray_add_uniq( &phony_targets, "install-lib" );
-                    strarray_add_uniq( &phony_targets, "uninstall" );
                 }
             }
-            else output( "all: %s\n", ttf_file );
-
+            if (source->flags & (FLAG_INSTALL | FLAG_SFD_FONTS))
+            {
+                strarray_add_uniq( &phony_targets, "install" );
+                strarray_add_uniq( &phony_targets, "install-lib" );
+                strarray_add_uniq( &phony_targets, "uninstall" );
+            }
             continue;  /* no dependencies */
         }
         else if (!strcmp( ext, "svg" ))  /* svg file */




More information about the wine-cvs mailing list