Permalink
Browse files

reduce Makefile.am modification on squashfuse

  • Loading branch information...
1 parent 906070a commit 00d908ba94b95e0b7911196be6f7a7df4cbd9154 @bignaux bignaux committed Oct 18, 2016
Showing with 35 additions and 70 deletions.
  1. +2 −1 build.sh
  2. +33 −69 squashfuse.patch
View
@@ -21,7 +21,8 @@ if [ ! -e ./Makefile ] ; then
autoheader
automake --force-missing --add-missing
autoconf
- ./configure --with-xz=/usr/lib/ --without-lz4 --without-lzo
+ ./configure --disable-demo --disable-high-level --disable-high-level \
+ --with-xz=/usr/lib/ --without-lz4 --without-lzo
fi
bash --version
View
@@ -1,6 +1,34 @@
---- a/ll.c 2016-09-14 20:36:50.373183135 +0200
-+++ b/ll.c 2016-09-14 14:00:08.893303000 +0200
-@@ -390,7 +390,7 @@
+diff --git a/Makefile.am b/Makefile.am
+index f0d7cde..70c4aa0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -14,6 +14,7 @@ bin_PROGRAMS =
+ noinst_PROGRAMS =
+
+ noinst_LTLIBRARIES = libsquashfuse.la
++noinst_LTLIBRARIES += libsquashfuse_ll.la
+
+ # Main library: libsquashfuse
+ libsquashfuse_la_SOURCES = swap.c cache.c table.c dir.c file.c fs.c \
+@@ -46,10 +47,9 @@ endif
+
+ # Low-level squashfuse_ll, if supported
+ if SQ_WANT_LOWLEVEL
+-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) \
++libsquashfuse_ll_la_SOURCES = ll.c ll_inode.c nonstd-daemon.c ll.h
++libsquashfuse_ll_la_CPPFLAGS = $(FUSE_CPPFLAGS)
++libsquashfuse_ll_la_LIBADD = libsquashfuse.la libfuseprivate.la $(COMPRESSION_LIBS) \
+ $(FUSE_LIBS)
+
+ noinst_LTLIBRARIES += libfuseprivate.la
+diff --git a/ll.c b/ll.c
+index a2c7902..8fcb3f4 100644
+--- a/ll.c
++++ b/ll.c
+@@ -390,7 +390,7 @@ static sqfs_ll *sqfs_ll_open(const char *path, size_t offset) {
return NULL;
}
@@ -9,7 +37,7 @@
struct fuse_args args;
sqfs_opts opts;
-@@ -451,6 +451,8 @@
+@@ -451,6 +451,8 @@ int main(int argc, char *argv[]) {
if (sqfs_ll_daemonize(fg) != -1) {
if (fuse_set_signal_handlers(se) != -1) {
fuse_session_add_chan(se, ch.ch);
@@ -18,7 +46,7 @@
/* FIXME: multithreading */
err = fuse_session_loop(se);
fuse_remove_signal_handlers(se);
-@@ -466,6 +468,8 @@
+@@ -466,6 +468,8 @@ int main(int argc, char *argv[]) {
}
}
fuse_opt_free_args(&args);
@@ -27,67 +55,3 @@
free(ll);
free(mountpoint);
---- a/Makefile.am 2016-09-14 23:23:30.003610060 +0200
-+++ b/Makefile.am 2016-09-14 23:21:52.731096000 +0200
-@@ -1,12 +1,7 @@
--COMPRESSION_LIBS = $(ZLIB_LIBS) $(XZ_LIBS) $(LZO_LIBS) $(LZ4_LIBS)
-+COMPRESSION_LIBS = $(ZLIB_LIBS) $(XZ_LIBS)
-
- ACLOCAL_AMFLAGS = -I m4 --install
-
--# Suppress AppleDouble
--if MAKE_EXPORT
--export COPYFILE_DISABLE = 1
--endif
--
- dist_man_MANS =
- EXTRA_DIST = gen_swap.sh autogen.sh LICENSE CONFIGURATION PLATFORMS NEWS win
-
-@@ -14,6 +9,7 @@
- noinst_PROGRAMS =
-
- noinst_LTLIBRARIES = libsquashfuse.la
-+noinst_LTLIBRARIES += libsquashfuse_ll.la
-
- # Main library: libsquashfuse
- libsquashfuse_la_SOURCES = swap.c cache.c table.c dir.c file.c fs.c \
-@@ -32,35 +28,14 @@
- libfuseprivate_la_CPPFLAGS = $(FUSE_CPPFLAGS)
- libfuseprivate_la_LIBADD =
-
--# 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)
--
--noinst_LTLIBRARIES += libfuseprivate.la
--dist_man_MANS += squashfuse.1
--endif
--
- # Low-level squashfuse_ll, if supported
--if SQ_WANT_LOWLEVEL
--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) \
-+libsquashfuse_ll_la_SOURCES = ll.c ll_inode.c nonstd-daemon.c ll.h
-+libsquashfuse_ll_la_CPPFLAGS = $(FUSE_CPPFLAGS)
-+libsquashfuse_ll_la_LIBADD = libsquashfuse.la libfuseprivate.la $(COMPRESSION_LIBS) \
- $(FUSE_LIBS)
-
--noinst_LTLIBRARIES += libfuseprivate.la
--endif
-
--if SQ_WANT_DEMO
--# Sample program squashfuse_ls
--noinst_PROGRAMS += squashfuse_ls
--squashfuse_ls_SOURCES = ls.c
--squashfuse_ls_LDADD = libsquashfuse.la $(COMPRESSION_LIBS)
--endif
-+noinst_LTLIBRARIES += libfuseprivate.la
-
- # Handle generation of swap include files
- CLEANFILES = swap.h.inc swap.c.inc

0 comments on commit 00d908b

Please sign in to comment.