diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-09-19 23:51:03 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-09-20 03:57:32 +0200 |
| commit | 5dcd267e9f0c5d93793e6d5e68279bd5dde5dff6 (patch) | |
| tree | 6e45f14cce5b468c2f9b23d7921acff60bd27eb0 /lib | |
| parent | 336a05a544ea8773653faa9a9d5078afaa839ff2 (diff) | |
Move canonicalize_name back to libutil
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fstree/Makemodule.am | 1 | ||||
| -rw-r--r-- | lib/util/Makemodule.am | 1 | ||||
| -rw-r--r-- | lib/util/canonicalize_name.c (renamed from lib/fstree/canonicalize_name.c) | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/fstree/Makemodule.am b/lib/fstree/Makemodule.am index 00150fd..d282de7 100644 --- a/lib/fstree/Makemodule.am +++ b/lib/fstree/Makemodule.am @@ -5,7 +5,6 @@ libfstree_a_SOURCES += lib/fstree/node_stat.c lib/fstree/mknode.c libfstree_a_SOURCES += lib/fstree/add_by_path.c lib/fstree/xattr.c libfstree_a_SOURCES += lib/fstree/node_from_path.c include/fstree.h libfstree_a_SOURCES += lib/fstree/gen_file_list.c -libfstree_a_SOURCES += lib/fstree/canonicalize_name.c libfstree_a_SOURCES += lib/fstree/source_date_epoch.c libfstree_a_CFLAGS = $(AM_CFLAGS) $(LIBSELINUX_CFLAGS) libfstree_a_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am index f7e06d3..2692c01 100644 --- a/lib/util/Makemodule.am +++ b/lib/util/Makemodule.am @@ -4,6 +4,7 @@ libutil_la_SOURCES += lib/util/mkdir_p.c libutil_la_SOURCES += lib/util/str_table.c include/str_table.h libutil_la_SOURCES += lib/util/dirstack.c lib/util/padd_file.c libutil_la_SOURCES += lib/util/read_data_at.c lib/util/alloc.c +libutil_la_SOURCES += lib/util/canonicalize_name.c libutil_la_CFLAGS = $(AM_CFLAGS) libutil_la_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/lib/fstree/canonicalize_name.c b/lib/util/canonicalize_name.c index 15c02be..4abbbe9 100644 --- a/lib/fstree/canonicalize_name.c +++ b/lib/util/canonicalize_name.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ +/* SPDX-License-Identifier: LGPL-3.0-or-later */ /* * canonicalize_name.c * @@ -6,7 +6,7 @@ */ #include "config.h" -#include "fstree.h" +#include "util.h" static void normalize_slashes(char *filename) { |