luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-11-05 18:48:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib-compile-resources: Fix creating depfile with other targets

Browse Source 
Follow up to 87d76a5a9c from bug 745754

https://bugzilla.gnome.org/show_bug.cgi?id=773344
This commit is contained in:
Patrick Griffis
2016-10-22 03:54:24 -04:00
parent feeb039e70
commit 243c1b7e84
1 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
gio/glib-compile-resources.c
View File

@@ -748,27 +748,18 @@ main (int argc, char **argv)
return 1; return 1;
} }
if (generate_dependencies || dependency_file != NULL) /* This can be used in the same invocation
as other generate commands */
if (dependency_file != NULL)
{ {
/* Generate a .d file that describes the dependencies for
* build tools, gcc -M -MF style */
GString *dep_string;
GHashTableIter iter; GHashTableIter iter;
gpointer key, data; gpointer key, data;
FileData *file_data; FileData *file_data;
g_hash_table_iter_init (&iter, files); g_hash_table_iter_init (&iter, files);
if (dependency_file == NULL)
{
/* Generate list of files for direct use as dependencies in a Makefile */
while (g_hash_table_iter_next (&iter, &key, &data))
{
file_data = data;
g_print ("%s\n", file_data->filename);
}
}
else
{
/* Generate a .d file that describes the dependencies for
* build tools, gcc -M -MF style */
GString *dep_string;
dep_string = g_string_new (NULL); dep_string = g_string_new (NULL);
g_string_printf (dep_string, "%s:", srcfile); g_string_printf (dep_string, "%s:", srcfile);
@@ -811,6 +802,21 @@ main (int argc, char **argv)
g_string_free (dep_string, TRUE); g_string_free (dep_string, TRUE);
g_free (dependency_file); g_free (dependency_file);
} }
if (generate_dependencies)
{
GHashTableIter iter;
gpointer key, data;
FileData *file_data;
g_hash_table_iter_init (&iter, files);
/* Generate list of files for direct use as dependencies in a Makefile */
while (g_hash_table_iter_next (&iter, &key, &data))
{
file_data = data;
g_print ("%s\n", file_data->filename);
}
} }
else if (generate_source || generate_header) else if (generate_source || generate_header)
{ {