diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2020-02-21 12:39:28 +0100 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2020-02-21 12:39:28 +0100 |
| commit | b63e39ade1e376ad8f433a0d751eddf4826a5230 (patch) | |
| tree | cb24f5327860d5eaa8363690df159c98f71ac500 /lib/sqfs/Makemodule.am | |
| parent | 69c0f7749aad857f6f9f6628a7e8d1d3e0dcb541 (diff) | |
Cleanup: move utilities back out of libsquashfs
This commit removes the allocation helpers and string table functions
out of libsquashfs back into a "libutil.a". The problem of libsquashfs
exporting stuff that it shouldn't is resolved by retaining the internal
attributes and directly adding the source to libsquashfs instead of
trying to somehow link against libutil.la.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/sqfs/Makemodule.am')
| -rw-r--r-- | lib/sqfs/Makemodule.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am index aada6c6..591eda2 100644 --- a/lib/sqfs/Makemodule.am +++ b/lib/sqfs/Makemodule.am @@ -24,8 +24,6 @@ libsquashfs_la_SOURCES += lib/sqfs/write_super.c lib/sqfs/data_reader.c libsquashfs_la_SOURCES += lib/sqfs/block_processor/internal.h libsquashfs_la_SOURCES += lib/sqfs/block_processor/common.c libsquashfs_la_SOURCES += lib/sqfs/block_processor/xxhash.c -libsquashfs_la_SOURCES += lib/sqfs/str_table.c lib/sqfs/str_table.h -libsquashfs_la_SOURCES += lib/sqfs/alloc.c lib/sqfs/util.h libsquashfs_la_SOURCES += lib/sqfs/frag_table.c include/sqfs/frag_table.h libsquashfs_la_SOURCES += lib/sqfs/block_writer.c include/sqfs/block_writer.h libsquashfs_la_CPPFLAGS = $(AM_CPPFLAGS) @@ -36,6 +34,9 @@ libsquashfs_la_CFLAGS += $(ZSTD_CFLAGS) $(PTHREAD_CFLAGS) libsquashfs_la_LIBADD = $(XZ_LIBS) $(ZLIB_LIBS) $(LZ4_LIBS) libsquashfs_la_LIBADD += $(ZSTD_LIBS) $(PTHREAD_LIBS) +# directly "import" stuff from libutil +libsquashfs_la_SOURCES += lib/util/str_table.c lib/util/alloc.c + if WINDOWS libsquashfs_la_SOURCES += lib/sqfs/win32/io_file.c libsquashfs_la_CFLAGS += -DWINVER=0x0600 -D_WIN32_WINNT=0x0600 |