aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-10-11 13:01:24 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-10-11 13:03:18 +0200
commit908449e1d50404278eb961ec8470781f1ba2deda (patch)
tree4e5e53ff4fd63575e048d586ae495bebee1f6429
parenta2a24daa63f933247564ac5ff19e2f7e1fd24e81 (diff)
Add the required libtool magic to build a Windows DLL
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
-rw-r--r--configure.ac2
-rw-r--r--lib/sqfs/Makemodule.am2
-rw-r--r--lib/util/Makemodule.am5
3 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 96aafab..0bf09ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_INIT([squashfs-tools-ng], [0.7], [goliath@infraroot.at], squashfs-tools-ng)
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects])
AM_SILENT_RULES([yes])
-LT_INIT
+LT_INIT([win32-dll])
AC_PROG_CC
AC_PROG_CC_C99
AC_PROG_INSTALL
diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am
index 821f22a..fa2ac19 100644
--- a/lib/sqfs/Makemodule.am
+++ b/lib/sqfs/Makemodule.am
@@ -24,6 +24,7 @@ libsquashfs_la_SOURCES += lib/sqfs/data_writer/internal.h lib/sqfs/data_reader.c
libsquashfs_la_SOURCES += lib/sqfs/data_writer/common.c
libsquashfs_la_SOURCES += lib/sqfs/data_writer/fileapi.c
libsquashfs_la_CPPFLAGS = $(AM_CPPFLAGS)
+libsquashfs_la_LDFLAGS = $(AM_LDFLAGS)
libsquashfs_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS)
libsquashfs_la_CFLAGS += $(XZ_CFLAGS) $(LZO_CFLAGS) $(LZ4_CFLAGS)
libsquashfs_la_CFLAGS += $(ZSTD_CFLAGS) $(PTHREAD_CFLAGS)
@@ -32,6 +33,7 @@ libsquashfs_la_LIBADD += $(ZSTD_LIBS) $(PTHREAD_LIBS) libutil.la
if WINDOWS
libsquashfs_la_SOURCES += lib/sqfs/win32/io_file.c
+libsquashfs_la_LDFLAGS += -no-undefined
else
libsquashfs_la_SOURCES += lib/sqfs/unix/io_file.c
endif
diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am
index d6d3928..d6005fa 100644
--- a/lib/util/Makemodule.am
+++ b/lib/util/Makemodule.am
@@ -3,5 +3,10 @@ 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_CFLAGS = $(AM_CFLAGS)
libutil_la_CPPFLAGS = $(AM_CPPFLAGS)
+libutil_la_LDFLAGS = $(AM_LDFLAGS)
+
+if WINDOWS
+libutil_la_LDFLAGS += -no-undefined
+endif
noinst_LTLIBRARIES += libutil.la