[PATCH v2 1/1] makedep: Install unixlibs with install-dev as well.

[Rémi Bernon]

From: Rémi Bernon

---
 tools/makedep.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/makedep.c b/tools/makedep.c
index 4e73894c933..893adbbaaac 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -120,9 +120,9 @@ static const struct
 static struct list files[HASH_SIZE];
 static struct list global_includes[HASH_SIZE];

-enum install_rules { INSTALL_LIB, INSTALL_DEV, INSTALL_TEST, NB_INSTALL_RULES };
-static const char *install_targets[NB_INSTALL_RULES] = { "install-lib", "install-dev", "install-test" };
-static const char *install_variables[NB_INSTALL_RULES] = { "INSTALL_LIB", "INSTALL_DEV", "INSTALL_TEST" };
+enum install_rules { INSTALL_LIB, INSTALL_DEV, INSTALL_UNIX, INSTALL_TEST, NB_INSTALL_RULES };
+static const char *install_targets[NB_INSTALL_RULES] = { "install-lib", "install-dev", "install-unix", "install-test" };
+static const char *install_variables[NB_INSTALL_RULES] = { "INSTALL_LIB", "INSTALL_DEV", "INSTALL_UNIX", "INSTALL_TEST" };

#define MAX_ARCHS 6

@@ -2729,6 +2729,7 @@ static void output_install_rules( struct makefile *make )
             strarray_addall_uniq( &targets, cmd->targets );

if (strcmp( install_targets[i], "install-test" )) output( "install " );
+        if (!strcmp( install_targets[i], "install-unix" )) output( "install-lib install-dev " );
         output( "%s::", install_targets[i] );
         output_filenames( targets );
         output_filename( install );
@@ -3710,6 +3711,7 @@ static void output_unix_lib( struct makefile *make )

strarray_add( &make->all_targets[arch], make->unixlib );
     install_program( make, make->module, arch, make->unixlib, arch_install_dirs[arch] );
+    install_program( make, make->unixlib, arch, make->unixlib, arch_install_dirs[arch] );
     output( "%s:", obj_dir_path( make, make->unixlib ));
     output_filenames_obj_dir( make, make->unixobj_files );
     output_filenames( unix_deps );
@@ -4567,6 +4569,7 @@ static void load_sources( struct makefile *make )
         for (i = 0; i < NB_INSTALL_RULES; i++) if (make->install[i].count) break;
         if (i == NB_INSTALL_RULES && !make->extlib)
         {
+            if (make->unixlib) strarray_add( &make->install[INSTALL_UNIX], make->unixlib );
             if (make->importlib) strarray_add( &make->install[INSTALL_DEV], make->importlib );
             if (make->staticlib) strarray_add( &make->install[INSTALL_DEV], make->staticlib );
             else strarray_add( &make->install[INSTALL_LIB], make->module );