summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-11-22 11:01:09 +0100
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-11-22 11:28:23 +0100
commiteafaffa0f09b7c22eed906ef5356b1460d44da55 (patch)
treee77a1c3ddf714301b93810c2d123b6a7fcdc2ee8 /lib
parent435c9ef3de5797d7c49fa8fae12a02fd6bd209d6 (diff)
Cleanup: move all the compatibillity fluff to a dedicated "libcompat"
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib')
-rw-r--r--lib/compat/Makemodule.am4
-rw-r--r--lib/compat/getline.c (renamed from lib/util/getline.c)4
-rw-r--r--lib/compat/getsubopt.c (renamed from lib/util/getsubopt.c)4
-rw-r--r--lib/compat/strndup.c (renamed from lib/util/strndup.c)4
-rw-r--r--lib/sqfs/id_table.c2
-rw-r--r--lib/sqfs/readdir.c2
-rw-r--r--lib/sqfs/write_inode.c2
-rw-r--r--lib/util/Makemodule.am8
8 files changed, 16 insertions, 14 deletions
diff --git a/lib/compat/Makemodule.am b/lib/compat/Makemodule.am
new file mode 100644
index 0000000..c197fb0
--- /dev/null
+++ b/lib/compat/Makemodule.am
@@ -0,0 +1,4 @@
+libcompat_a_SOURCES = lib/compat/getline.c lib/compat/getsubopt.c
+libcompat_a_SOURCES += lib/compat/strndup.c include/compat.h
+
+noinst_LIBRARIES += libcompat.a
diff --git a/lib/util/getline.c b/lib/compat/getline.c
index 996bef2..f330c6d 100644
--- a/lib/util/getline.c
+++ b/lib/compat/getline.c
@@ -1,11 +1,11 @@
-/* SPDX-License-Identifier: LGPL-3.0-or-later */
+/* SPDX-License-Identifier: GPL-3.0-or-later */
/*
* getline.c
*
* Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
*/
#include "config.h"
-#include "util/compat.h"
+#include "compat.h"
#include <string.h>
#include <stdlib.h>
diff --git a/lib/util/getsubopt.c b/lib/compat/getsubopt.c
index 5cf19d1..d53a37d 100644
--- a/lib/util/getsubopt.c
+++ b/lib/compat/getsubopt.c
@@ -1,11 +1,11 @@
-/* SPDX-License-Identifier: LGPL-3.0-or-later */
+/* SPDX-License-Identifier: GPL-3.0-or-later */
/*
* getsubopt.c
*
* Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
*/
#include "config.h"
-#include "util/compat.h"
+#include "compat.h"
#include <stdlib.h>
#include <string.h>
diff --git a/lib/util/strndup.c b/lib/compat/strndup.c
index 8031d23..dff79d7 100644
--- a/lib/util/strndup.c
+++ b/lib/compat/strndup.c
@@ -1,11 +1,11 @@
-/* SPDX-License-Identifier: LGPL-3.0-or-later */
+/* SPDX-License-Identifier: GPL-3.0-or-later */
/*
* strndup.c
*
* Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
*/
#include "config.h"
-#include "util/compat.h"
+#include "compat.h"
#include <string.h>
#include <stdlib.h>
diff --git a/lib/sqfs/id_table.c b/lib/sqfs/id_table.c
index 4080015..a320eca 100644
--- a/lib/sqfs/id_table.c
+++ b/lib/sqfs/id_table.c
@@ -11,7 +11,7 @@
#include "sqfs/super.h"
#include "sqfs/table.h"
#include "sqfs/error.h"
-#include "util/compat.h"
+#include "compat.h"
#include <stdlib.h>
#include <string.h>
diff --git a/lib/sqfs/readdir.c b/lib/sqfs/readdir.c
index d800cb7..8899475 100644
--- a/lib/sqfs/readdir.c
+++ b/lib/sqfs/readdir.c
@@ -10,7 +10,7 @@
#include "sqfs/meta_reader.h"
#include "sqfs/error.h"
#include "sqfs/dir.h"
-#include "util/compat.h"
+#include "compat.h"
#include <stdlib.h>
#include <string.h>
diff --git a/lib/sqfs/write_inode.c b/lib/sqfs/write_inode.c
index f1f8abf..5f0ef4c 100644
--- a/lib/sqfs/write_inode.c
+++ b/lib/sqfs/write_inode.c
@@ -11,7 +11,7 @@
#include "sqfs/error.h"
#include "sqfs/inode.h"
#include "sqfs/dir.h"
-#include "util/compat.h"
+#include "compat.h"
#include <string.h>
diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am
index b5fef29..6a1a6a8 100644
--- a/lib/util/Makemodule.am
+++ b/lib/util/Makemodule.am
@@ -1,8 +1,6 @@
-libutil_la_SOURCES = include/util/util.h include/util/compat.h
-libutil_la_SOURCES += lib/util/str_table.c include/util/str_table.h
-libutil_la_SOURCES += lib/util/alloc.c lib/util/canonicalize_name.c
-libutil_la_SOURCES += lib/util/strndup.c lib/util/getline.c
-libutil_la_SOURCES += lib/util/getsubopt.c
+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_CFLAGS = $(AM_CFLAGS)
libutil_la_CPPFLAGS = $(AM_CPPFLAGS)
libutil_la_LDFLAGS = $(AM_LDFLAGS)