[glib/glib-2-50] Revert "glib-compile-resources: Output depfile in same directory as target"
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/glib-2-50] Revert "glib-compile-resources: Output depfile in same directory as target"
- Date: Sun, 6 Nov 2016 02:34:55 +0000 (UTC)
commit 5f9e10598c765ef261b3973e4a0a9c03fe5236be
Author: Patrick Griffis <tingping tingping se>
Date: Sat Nov 5 22:34:44 2016 -0400
Revert "glib-compile-resources: Output depfile in same directory as target"
This reverts commit 4404d1929f79b4e725b92910922b0c3afbc707ac.
docs/reference/gio/glib-compile-resources.xml | 2 --
gio/glib-compile-resources.c | 11 -----------
2 files changed, 0 insertions(+), 13 deletions(-)
---
diff --git a/docs/reference/gio/glib-compile-resources.xml b/docs/reference/gio/glib-compile-resources.xml
index 85ce284..f5a1e62 100644
--- a/docs/reference/gio/glib-compile-resources.xml
+++ b/docs/reference/gio/glib-compile-resources.xml
@@ -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
combined with other <option>--generate</option> options to generate dependencies
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>
</varlistentry>
diff --git a/gio/glib-compile-resources.c b/gio/glib-compile-resources.c
index c319ee7..bd5058d 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]