From d1763d899c60b5d1cb4b24e2e326564a3377f9be Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Sat, 5 Nov 2016 22:15:53 -0400 Subject: [PATCH] Revert "glib-compile-resources: Output depfile in same directory as target" This reverts commit 9006940de604a8d72bf9198a0e4b20cd113c4b11. --- docs/reference/gio/glib-compile-resources.xml | 2 -- gio/glib-compile-resources.c | 11 ----------- 2 files changed, 13 deletions(-) diff --git a/docs/reference/gio/glib-compile-resources.xml b/docs/reference/gio/glib-compile-resources.xml index 85ce28436..f5a1e6257 100644 --- a/docs/reference/gio/glib-compile-resources.xml +++ b/docs/reference/gio/glib-compile-resources.xml @@ -178,8 +178,6 @@ If is -, the dependencies are written to the standard output. Unlike , this option can be combined with other options to generate dependencies as a side-effect of generating sources. -If is not an absolute path and -is passed then it will be relative to the same directory as the target output. diff --git a/gio/glib-compile-resources.c b/gio/glib-compile-resources.c index ce02d1a4d..3d13b124e 100644 --- a/gio/glib-compile-resources.c +++ b/gio/glib-compile-resources.c @@ -789,17 +789,6 @@ main (int argc, char **argv) } 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)) { g_printerr ("Error writing dependency file: %s\n", error->message);