Split squashfuse_ll into a lib and executable (#59)

* Split squashfuse_ll into a lib and executable

This makes it easier for people to statically link squashfuse_ll into
their application, which can in turn be used to more easily ship
self-exectracting binaries (e.g. facebook xar or appimage)

Author: haampie

.cirrus.yml

@@ -17,7 +17,7 @@ task:
   build_script:
     - ./autogen.sh
     - CPPFLAGS="$CONFIGURE_CPPFLAGS -Werror" LDFLAGS="$CONFIGURE_LDFLAGS" ./configure
-    - make
+    - make V=1
   test_script:
     - make check
     - diff -u ci/expected-features/all ci/features

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
         run: |
           ./autogen.sh
           CPPFLAGS="-Werror" ./configure
-          make -j3
+          make -j3 V=1
       - name: test
         run: |
           make check

.gitignore

@@ -21,7 +21,7 @@ build-aux
 configure
 libtool
 stamp-h1
-squashfuse.pc
+*.pc
 
 win/Debug
 win/Release

.travis.yml

@@ -30,7 +30,7 @@ jobs:
     os: windows
 env:
   global:
-    - MAKEFLAGS="-j3"
+    - MAKEFLAGS="-j3 V=1"
 addons:
   apt:
     update: true

Makefile.am

@@ -12,57 +12,80 @@ EXTRA_DIST = gen_swap.sh autogen.sh LICENSE CONFIGURATION PLATFORMS NEWS win
 
 bin_PROGRAMS =
 noinst_PROGRAMS =
-
-lib_LTLIBRARIES = libsquashfuse.la
+lib_LTLIBRARIES = 
 noinst_LTLIBRARIES =
 
 pkgincludedir = @includedir@/squashfuse
 pkginclude_HEADERS = squashfuse.h squashfs_fs.h \
 	cache.h common.h config.h decompress.h dir.h file.h fs.h stack.h table.h \
 	traverse.h util.h xattr.h
-
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA 	= squashfuse.pc
 
-# Main library: libsquashfuse
-libsquashfuse_la_SOURCES = swap.c cache.c table.c dir.c file.c fs.c \
+# Convenience lib to we get static executables
+noinst_LTLIBRARIES += libsquashfuse_convenience.la
+libsquashfuse_convenience_la_SOURCES = swap.c cache.c table.c dir.c file.c fs.c \
 	decompress.c xattr.c hash.c stack.c traverse.c util.c \
 	nonstd-pread.c nonstd-stat.c \
 	squashfs_fs.h common.h nonstd-internal.h nonstd.h swap.h cache.h table.h \
 	dir.h file.h decompress.h xattr.h squashfuse.h hash.h stack.h traverse.h \
 	util.h fs.h
+libsquashfuse_convenience_la_CPPFLAGS = $(ZLIB_CPPFLAGS) $(XZ_CPPFLAGS) $(LZO_CPPFLAGS) \
+	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS)
+libsquashfuse_convenience_la_LIBADD = $(COMPRESSION_LIBS) $(FUSE_LIBS)
+
+# Main library: libsquashfuse
+lib_LTLIBRARIES += libsquashfuse.la
+libsquashfuse_la_SOURCES =
 libsquashfuse_la_CPPFLAGS = $(ZLIB_CPPFLAGS) $(XZ_CPPFLAGS) $(LZO_CPPFLAGS) \
-	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS)
-libsquashfuse_la_LIBADD =
+	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS)
+libsquashfuse_la_LIBADD = libsquashfuse_convenience.la
 
 if SQ_WANT_FUSE
 # Helper for FUSE clients: libfuseprivate
 libfuseprivate_la_SOURCES = fuseprivate.c nonstd-makedev.c nonstd-enoattr.c \
 	fuseprivate.h stat.h stat.c
 libfuseprivate_la_CPPFLAGS = $(FUSE_CPPFLAGS)
-libfuseprivate_la_LIBADD =
+libfuseprivate_la_LIBADD = $(COMPRESSION_LIBS) $(FUSE_LIBS)
 noinst_LTLIBRARIES += libfuseprivate.la
 endif
 
 # High-level squashfuse
 if SQ_WANT_HIGHLEVEL
 bin_PROGRAMS += squashfuse
 squashfuse_SOURCES = hl.c
-squashfuse_CPPFLAGS = $(FUSE_CPPFLAGS)
-squashfuse_LDADD = libsquashfuse.la libfuseprivate.la $(COMPRESSION_LIBS) \
-  $(FUSE_LIBS)
-
+squashfuse_CPPFLAGS = $(ZLIB_CPPFLAGS) $(XZ_CPPFLAGS) $(LZO_CPPFLAGS) \
+	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS)
+squashfuse_LDADD = libsquashfuse_convenience.la libfuseprivate.la $(COMPRESSION_LIBS) $(FUSE_LIBS)
 dist_man_MANS += squashfuse.1
 endif
 
 # Low-level squashfuse_ll, if supported
 if SQ_WANT_LOWLEVEL
+
+# convenience lib so we can link squashfuse_ll statically
+noinst_LTLIBRARIES += libsquashfuse_ll_convenience.la
+libsquashfuse_ll_convenience_la_SOURCES = ll.c ll_inode.c nonstd-daemon.c
+libsquashfuse_ll_convenience_la_CPPFLAGS = $(ZLIB_CPPFLAGS) $(XZ_CPPFLAGS) $(LZO_CPPFLAGS) \
+	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS)
+libsquashfuse_ll_convenience_la_LIBADD = libsquashfuse_convenience.la libfuseprivate.la
+
+# squashfuse_ll library we will install
+lib_LTLIBRARIES += libsquashfuse_ll.la
+libsquashfuse_ll_la_SOURCES =
+libsquashfuse_ll_la_CPPFLAGS = $(ZLIB_CPPFLAGS) $(XZ_CPPFLAGS) $(LZO_CPPFLAGS) \
+	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS)
+libsquashfuse_ll_la_LIBADD = libsquashfuse_ll_convenience.la $(COMPRESSION_LIBS) $(FUSE_LIBS)
+
+# squashfuse_ll binary that's statically linked against internal libs
 bin_PROGRAMS += squashfuse_ll
-squashfuse_ll_SOURCES = ll.c ll_inode.c nonstd-daemon.c ll.h
-squashfuse_ll_CPPFLAGS = $(FUSE_CPPFLAGS)
-squashfuse_ll_LDADD = libsquashfuse.la libfuseprivate.la $(COMPRESSION_LIBS) \
-  $(FUSE_LIBS)
+squashfuse_ll_SOURCES = ll_main.c
+squashfuse_ll_CPPFLAGS = $(ZLIB_CPPFLAGS) $(XZ_CPPFLAGS) $(LZO_CPPFLAGS) \
+	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS)
+squashfuse_ll_LDADD = libsquashfuse_ll_convenience.la $(COMPRESSION_LIBS) $(FUSE_LIBS)
 
+pkgconfig_DATA += squashfuse_ll.pc
+pkginclude_HEADERS += ll.h
 endif
 
 
@@ -95,6 +118,6 @@ tests/ll-smoke.sh tests/ls.sh: tests/lib.sh
 # Handle generation of swap include files
 CLEANFILES = swap.h.inc swap.c.inc
 EXTRA_DIST += swap.h.inc swap.c.inc
-$(libsquashfuse_la_OBJECTS): swap.h.inc
+$(libsquashfuse_convenience_la_OBJECTS): swap.h.inc
 swap.h.inc swap.c.inc: gen_swap.sh squashfs_fs.h Makefile
 	SED="$(SED)" $(srcdir)/gen_swap.sh $(srcdir)/squashfs_fs.h

configure.ac

@@ -100,7 +100,7 @@ AC_SUBST([sq_high_level])
 AC_SUBST([sq_low_level])
 AC_SUBST([sq_demo])
 AC_SUBST([sq_tests])
-AC_CONFIG_FILES([Makefile squashfuse.pc tests/lib.sh ci/features])
+AC_CONFIG_FILES([Makefile squashfuse.pc squashfuse_ll.pc tests/lib.sh ci/features])
 AC_OUTPUT
 
 AS_ECHO()