luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-27 17:46:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "glib-compile-resources: Output depfile in same directory as target"

Browse Source 
This reverts commit 9006940de604a8d72bf9198a0e4b20cd113c4b11.
This commit is contained in:
Patrick Griffis 2016-11-05 22:15:53 -04:00
parent 9006940de6
commit d1763d899c
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/gio/glib-compile-resources.xml
View File

@ -178,8 +178,6 @@ If <option>FILE</option> is -, the dependencies are written to the standard
output. Unlike <option>--generate-dependencies</option>, this option can be output. Unlike <option>--generate-dependencies</option>, this option can be
combined with other <option>--generate</option> options to generate dependencies combined with other <option>--generate</option> options to generate dependencies
as a side-effect of generating sources. as a side-effect of generating sources.
If <option>FILE</option> is not an absolute path and <option>--target</option>
is passed then it will be relative to the same directory as the target output.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>

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

@ -789,17 +789,6 @@ main (int argc, char **argv)
} }
else else
{ {
/* Output depfile next to generated file */
if (!g_path_is_absolute (dependency_file) && target != NULL)
{
char *targetdir = g_path_get_dirname (target);
char *tmp = dependency_file;
dependency_file = g_build_filename (targetdir, dependency_file, NULL);
g_free (tmp);
g_free (targetdir);
}
if (!g_file_set_contents (dependency_file, dep_string->str, dep_string->len, &error)) if (!g_file_set_contents (dependency_file, dep_string->str, dep_string->len, &error))
{ {
g_printerr ("Error writing dependency file: %s\n", error->message); g_printerr ("Error writing dependency file: %s\n", error->message);