diff options
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | bin/Makemodule.am | 48 | ||||
| -rw-r--r-- | bin/gensquashfs/Makemodule.am | 15 | ||||
| -rw-r--r-- | bin/rdsquashfs/Makemodule.am | 10 | ||||
| -rw-r--r-- | bin/sqfs2tar/Makemodule.am | 8 | ||||
| -rw-r--r-- | bin/sqfsdiff/Makemodule.am | 11 | ||||
| -rw-r--r-- | bin/tar2sqfs/Makemodule.am | 9 | ||||
| -rw-r--r-- | doc/Makemodule.am | 1 |
8 files changed, 59 insertions, 51 deletions
diff --git a/Makefile.am b/Makefile.am index 7b62028..26a4458 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,18 +18,22 @@ check_SCRIPTS = pkgconfig_DATA = EXTRA_DIST = autogen.sh README.md CHANGELOG.md COPYING.md mkwinbins.sh licenses +EXTRA_DIST += doc TESTS = include lib/sqfs/Makemodule.am if BUILD_TOOLS -include doc/Makemodule.am include lib/fstree/Makemodule.am include lib/common/Makemodule.am include lib/tar/Makemodule.am include lib/compat/Makemodule.am include lib/util/Makemodule.am -include bin/Makemodule.am +include bin/gensquashfs/Makemodule.am +include bin/rdsquashfs/Makemodule.am +include bin/sqfs2tar/Makemodule.am +include bin/sqfsdiff/Makemodule.am +include bin/tar2sqfs/Makemodule.am endif include extras/Makemodule.am diff --git a/bin/Makemodule.am b/bin/Makemodule.am deleted file mode 100644 index 298734d..0000000 --- a/bin/Makemodule.am +++ /dev/null @@ -1,48 +0,0 @@ -sqfs2tar_SOURCES = bin/sqfs2tar/sqfs2tar.c bin/sqfs2tar/sqfs2tar.h -sqfs2tar_SOURCES += bin/sqfs2tar/options.c bin/sqfs2tar/write_tree.c -sqfs2tar_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -sqfs2tar_LDADD = libcommon.a libutil.a libsquashfs.la libtar.a libcompat.a -sqfs2tar_LDADD += libfstree.a $(LZO_LIBS) $(PTHREAD_LIBS) - -tar2sqfs_SOURCES = bin/tar2sqfs/tar2sqfs.c bin/tar2sqfs/tar2sqfs.h -tar2sqfs_SOURCES += bin/tar2sqfs/options.c bin/tar2sqfs/process_tarball.c -tar2sqfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -tar2sqfs_LDADD = libcommon.a libsquashfs.la libtar.a -tar2sqfs_LDADD += libfstree.a libcompat.a libfstree.a $(LZO_LIBS) -tar2sqfs_LDADD += $(PTHREAD_LIBS) - -rdsquashfs_SOURCES = bin/rdsquashfs/rdsquashfs.c bin/rdsquashfs/rdsquashfs.h -rdsquashfs_SOURCES += bin/rdsquashfs/list_files.c bin/rdsquashfs/options.c -rdsquashfs_SOURCES += bin/rdsquashfs/restore_fstree.c bin/rdsquashfs/describe.c -rdsquashfs_SOURCES += bin/rdsquashfs/fill_files.c bin/rdsquashfs/dump_xattrs.c -rdsquashfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -rdsquashfs_LDADD = libcommon.a libcompat.a libsquashfs.la -rdsquashfs_LDADD += libfstree.a $(LZO_LIBS) $(PTHREAD_LIBS) - -sqfsdiff_SOURCES = bin/sqfsdiff/sqfsdiff.c bin/sqfsdiff/sqfsdiff.h -sqfsdiff_SOURCES += bin/sqfsdiff/util.c bin/sqfsdiff/options.c -sqfsdiff_SOURCES += bin/sqfsdiff/compare_dir.c bin/sqfsdiff/node_compare.c -sqfsdiff_SOURCES += bin/sqfsdiff/compare_files.c bin/sqfsdiff/super.c -sqfsdiff_SOURCES += bin/sqfsdiff/extract.c -sqfsdiff_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -sqfsdiff_LDADD = libcommon.a libsquashfs.la libcompat.a $(LZO_LIBS) libfstree.a -sqfsdiff_LDADD += $(PTHREAD_LIBS) - -gensquashfs_SOURCES = bin/gensquashfs/mkfs.c bin/gensquashfs/mkfs.h -gensquashfs_SOURCES += bin/gensquashfs/options.c bin/gensquashfs/selinux.c -gensquashfs_SOURCES += bin/gensquashfs/dirscan.c bin/gensquashfs/dirscan_xattr.c -gensquashfs_LDADD = libcommon.a libsquashfs.la libfstree.a -gensquashfs_LDADD += libcompat.a $(LIBSELINUX_LIBS) $(LZO_LIBS) -gensquashfs_LDADD += $(PTHREAD_LIBS) -gensquashfs_CPPFLAGS = $(AM_CPPFLAGS) -gensquashfs_CFLAGS = $(AM_CFLAGS) $(LIBSELINUX_CFLAGS) $(PTHREAD_CFLAGS) - -if WITH_SELINUX -gensquashfs_CPPFLAGS += -DWITH_SELINUX -endif - -dist_man1_MANS += bin/gensquashfs/gensquashfs.1 bin/rdsquashfs/rdsquashfs.1 -dist_man1_MANS += bin/sqfs2tar/sqfs2tar.1 bin/tar2sqfs/tar2sqfs.1 -dist_man1_MANS += bin/sqfsdiff/sqfsdiff.1 - -bin_PROGRAMS += sqfs2tar tar2sqfs gensquashfs rdsquashfs sqfsdiff diff --git a/bin/gensquashfs/Makemodule.am b/bin/gensquashfs/Makemodule.am new file mode 100644 index 0000000..ab11dae --- /dev/null +++ b/bin/gensquashfs/Makemodule.am @@ -0,0 +1,15 @@ +gensquashfs_SOURCES = bin/gensquashfs/mkfs.c bin/gensquashfs/mkfs.h +gensquashfs_SOURCES += bin/gensquashfs/options.c bin/gensquashfs/selinux.c +gensquashfs_SOURCES += bin/gensquashfs/dirscan.c bin/gensquashfs/dirscan_xattr.c +gensquashfs_LDADD = libcommon.a libsquashfs.la libfstree.a +gensquashfs_LDADD += libcompat.a $(LIBSELINUX_LIBS) $(LZO_LIBS) +gensquashfs_LDADD += $(PTHREAD_LIBS) +gensquashfs_CPPFLAGS = $(AM_CPPFLAGS) +gensquashfs_CFLAGS = $(AM_CFLAGS) $(LIBSELINUX_CFLAGS) $(PTHREAD_CFLAGS) + +if WITH_SELINUX +gensquashfs_CPPFLAGS += -DWITH_SELINUX +endif + +dist_man1_MANS += bin/gensquashfs/gensquashfs.1 +bin_PROGRAMS += gensquashfs diff --git a/bin/rdsquashfs/Makemodule.am b/bin/rdsquashfs/Makemodule.am new file mode 100644 index 0000000..d99d6ee --- /dev/null +++ b/bin/rdsquashfs/Makemodule.am @@ -0,0 +1,10 @@ +rdsquashfs_SOURCES = bin/rdsquashfs/rdsquashfs.c bin/rdsquashfs/rdsquashfs.h +rdsquashfs_SOURCES += bin/rdsquashfs/list_files.c bin/rdsquashfs/options.c +rdsquashfs_SOURCES += bin/rdsquashfs/restore_fstree.c bin/rdsquashfs/describe.c +rdsquashfs_SOURCES += bin/rdsquashfs/fill_files.c bin/rdsquashfs/dump_xattrs.c +rdsquashfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) +rdsquashfs_LDADD = libcommon.a libcompat.a libsquashfs.la +rdsquashfs_LDADD += libfstree.a $(LZO_LIBS) $(PTHREAD_LIBS) + +dist_man1_MANS += bin/rdsquashfs/rdsquashfs.1 +bin_PROGRAMS += rdsquashfs diff --git a/bin/sqfs2tar/Makemodule.am b/bin/sqfs2tar/Makemodule.am new file mode 100644 index 0000000..3c5662d --- /dev/null +++ b/bin/sqfs2tar/Makemodule.am @@ -0,0 +1,8 @@ +sqfs2tar_SOURCES = bin/sqfs2tar/sqfs2tar.c bin/sqfs2tar/sqfs2tar.h +sqfs2tar_SOURCES += bin/sqfs2tar/options.c bin/sqfs2tar/write_tree.c +sqfs2tar_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) +sqfs2tar_LDADD = libcommon.a libutil.a libsquashfs.la libtar.a libcompat.a +sqfs2tar_LDADD += libfstree.a $(LZO_LIBS) $(PTHREAD_LIBS) + +dist_man1_MANS += bin/sqfs2tar/sqfs2tar.1 +bin_PROGRAMS += sqfs2tar diff --git a/bin/sqfsdiff/Makemodule.am b/bin/sqfsdiff/Makemodule.am new file mode 100644 index 0000000..b5de502 --- /dev/null +++ b/bin/sqfsdiff/Makemodule.am @@ -0,0 +1,11 @@ +sqfsdiff_SOURCES = bin/sqfsdiff/sqfsdiff.c bin/sqfsdiff/sqfsdiff.h +sqfsdiff_SOURCES += bin/sqfsdiff/util.c bin/sqfsdiff/options.c +sqfsdiff_SOURCES += bin/sqfsdiff/compare_dir.c bin/sqfsdiff/node_compare.c +sqfsdiff_SOURCES += bin/sqfsdiff/compare_files.c bin/sqfsdiff/super.c +sqfsdiff_SOURCES += bin/sqfsdiff/extract.c +sqfsdiff_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) +sqfsdiff_LDADD = libcommon.a libsquashfs.la libcompat.a $(LZO_LIBS) libfstree.a +sqfsdiff_LDADD += $(PTHREAD_LIBS) + +dist_man1_MANS += bin/sqfsdiff/sqfsdiff.1 +bin_PROGRAMS += sqfsdiff diff --git a/bin/tar2sqfs/Makemodule.am b/bin/tar2sqfs/Makemodule.am new file mode 100644 index 0000000..16bec99 --- /dev/null +++ b/bin/tar2sqfs/Makemodule.am @@ -0,0 +1,9 @@ +tar2sqfs_SOURCES = bin/tar2sqfs/tar2sqfs.c bin/tar2sqfs/tar2sqfs.h +tar2sqfs_SOURCES += bin/tar2sqfs/options.c bin/tar2sqfs/process_tarball.c +tar2sqfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) +tar2sqfs_LDADD = libcommon.a libsquashfs.la libtar.a +tar2sqfs_LDADD += libfstree.a libcompat.a libfstree.a $(LZO_LIBS) +tar2sqfs_LDADD += $(PTHREAD_LIBS) + +dist_man1_MANS += bin/tar2sqfs/tar2sqfs.1 +bin_PROGRAMS += tar2sqfs diff --git a/doc/Makemodule.am b/doc/Makemodule.am deleted file mode 100644 index f6870c8..0000000 --- a/doc/Makemodule.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST += doc/format.txt doc/parallelism.txt doc/mainpage.dox |