diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-11-24 17:16:06 +0100 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-11-24 17:16:06 +0100 |
| commit | 0709d31d5ef3ec19331abcd97545add26b7b0e13 (patch) | |
| tree | 4895cc87c32df9ea2ee1707951ee85019b90536c /lib | |
| parent | 3c79472a773210127bec1768aaf85e540daa3f9f (diff) | |
Cleanup: move canonicalize_name back to libfstree.a
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/fstree/canonicalize_name.c (renamed from lib/util/canonicalize_name.c) | 5 | ||||
| -rw-r--r-- | lib/util/Makemodule.am | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/lib/fstree/Makemodule.am b/lib/fstree/Makemodule.am index be5f8fc..6638480 100644 --- a/lib/fstree/Makemodule.am +++ b/lib/fstree/Makemodule.am @@ -6,6 +6,7 @@ libfstree_a_SOURCES += lib/fstree/add_by_path.c libfstree_a_SOURCES += include/fstree.h libfstree_a_SOURCES += lib/fstree/gen_file_list.c libfstree_a_SOURCES += lib/fstree/source_date_epoch.c +libfstree_a_SOURCES += lib/fstree/canonicalize_name.c libfstree_a_CFLAGS = $(AM_CFLAGS) libfstree_a_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/lib/util/canonicalize_name.c b/lib/fstree/canonicalize_name.c index 33e1c0b..f35307f 100644 --- a/lib/util/canonicalize_name.c +++ b/lib/fstree/canonicalize_name.c @@ -1,12 +1,11 @@ -/* SPDX-License-Identifier: LGPL-3.0-or-later */ +/* SPDX-License-Identifier: GPL-3.0-or-later */ /* * canonicalize_name.c * * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at> */ #include "config.h" - -#include "util/util.h" +#include "fstree.h" static void normalize_slashes(char *filename) { diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am index 6a1a6a8..07e94e2 100644 --- a/lib/util/Makemodule.am +++ b/lib/util/Makemodule.am @@ -1,6 +1,5 @@ libutil_la_SOURCES = include/util/util.h include/util/str_table.h -libutil_la_SOURCES += lib/util/str_table.c lib/util/canonicalize_name.c -libutil_la_SOURCES += lib/util/alloc.c +libutil_la_SOURCES += lib/util/str_table.c lib/util/alloc.c libutil_la_CFLAGS = $(AM_CFLAGS) libutil_la_CPPFLAGS = $(AM_CPPFLAGS) libutil_la_LDFLAGS = $(AM_LDFLAGS) |