summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-11-25 13:28:28 +0100
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-11-25 13:28:28 +0100
commit94b547d27f953fefa0ed080611eb916f58702e87 (patch)
tree2f6cce57154b494d0c26588421a979f64c635b9b /lib
parentfc9a644002dc501a5c224e5cc1a7dfba3ca2d1d8 (diff)
Cleanup: remove what is left of libutil
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib')
-rw-r--r--lib/compat/chdir.c2
-rw-r--r--lib/fstree/fstree.c1
-rw-r--r--lib/fstree/fstree_from_file.c1
-rw-r--r--lib/fstree/gen_inode_table.c1
-rw-r--r--lib/sqfs/Makemodule.am2
-rw-r--r--lib/tar/internal.h1
-rw-r--r--lib/tar/skip.c1
-rw-r--r--lib/util/Makemodule.am11
8 files changed, 1 insertions, 19 deletions
diff --git a/lib/compat/chdir.c b/lib/compat/chdir.c
index 04dcf17..3a6ecb1 100644
--- a/lib/compat/chdir.c
+++ b/lib/compat/chdir.c
@@ -7,8 +7,6 @@
#include "config.h"
#include "compat.h"
-#include "util/util.h"
-
#ifdef _WIN32
#include <stdlib.h>
diff --git a/lib/fstree/fstree.c b/lib/fstree/fstree.c
index a2d9eee..ad48508 100644
--- a/lib/fstree/fstree.c
+++ b/lib/fstree/fstree.c
@@ -7,7 +7,6 @@
#include "config.h"
#include "fstree.h"
-#include "util/util.h"
#include <string.h>
#include <stdlib.h>
diff --git a/lib/fstree/fstree_from_file.c b/lib/fstree/fstree_from_file.c
index 825a2e2..9cdf9a1 100644
--- a/lib/fstree/fstree_from_file.c
+++ b/lib/fstree/fstree_from_file.c
@@ -7,7 +7,6 @@
#include "config.h"
#include "fstree.h"
-#include "util/util.h"
#include <stdlib.h>
#include <stdint.h>
diff --git a/lib/fstree/gen_inode_table.c b/lib/fstree/gen_inode_table.c
index a5a28c9..006029f 100644
--- a/lib/fstree/gen_inode_table.c
+++ b/lib/fstree/gen_inode_table.c
@@ -7,7 +7,6 @@
#include "config.h"
#include "fstree.h"
-#include "util/util.h"
#include <stdlib.h>
#include <stdio.h>
diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am
index 59cdbcb..dffca44 100644
--- a/lib/sqfs/Makemodule.am
+++ b/lib/sqfs/Makemodule.am
@@ -31,7 +31,7 @@ libsquashfs_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS)
libsquashfs_la_CFLAGS += $(XZ_CFLAGS) $(LZ4_CFLAGS)
libsquashfs_la_CFLAGS += $(ZSTD_CFLAGS) $(PTHREAD_CFLAGS)
libsquashfs_la_LIBADD = $(XZ_LIBS) $(ZLIB_LIBS) $(LZ4_LIBS)
-libsquashfs_la_LIBADD += $(ZSTD_LIBS) $(PTHREAD_LIBS) libutil.la
+libsquashfs_la_LIBADD += $(ZSTD_LIBS) $(PTHREAD_LIBS)
if WINDOWS
libsquashfs_la_SOURCES += lib/sqfs/win32/io_file.c
diff --git a/lib/tar/internal.h b/lib/tar/internal.h
index e67e7fa..055637a 100644
--- a/lib/tar/internal.h
+++ b/lib/tar/internal.h
@@ -9,7 +9,6 @@
#include "config.h"
-#include "util/util.h"
#include "tar.h"
#include <string.h>
diff --git a/lib/tar/skip.c b/lib/tar/skip.c
index 94e4a96..36cd470 100644
--- a/lib/tar/skip.c
+++ b/lib/tar/skip.c
@@ -6,7 +6,6 @@
*/
#include "config.h"
-#include "util/util.h"
#include "tar.h"
#include <stdio.h>
diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am
deleted file mode 100644
index 0ee762b..0000000
--- a/lib/util/Makemodule.am
+++ /dev/null
@@ -1,11 +0,0 @@
-libutil_la_SOURCES = include/util/util.h
-libutil_la_CFLAGS = $(AM_CFLAGS)
-libutil_la_CPPFLAGS = $(AM_CPPFLAGS)
-libutil_la_LDFLAGS = $(AM_LDFLAGS)
-
-if WINDOWS
-libutil_la_CFLAGS += -Wc,-static-libgcc
-libutil_la_LDFLAGS += -no-undefined -avoid-version
-endif
-
-noinst_LTLIBRARIES += libutil.la