diff options
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | bin/Makemodule.am | 42 | ||||
| -rw-r--r-- | bin/gensquashfs/dirscan.c (renamed from mkfs/dirscan.c) | 0 | ||||
| -rw-r--r-- | bin/gensquashfs/mkfs.c (renamed from mkfs/mkfs.c) | 0 | ||||
| -rw-r--r-- | bin/gensquashfs/mkfs.h (renamed from mkfs/mkfs.h) | 0 | ||||
| -rw-r--r-- | bin/gensquashfs/options.c (renamed from mkfs/options.c) | 0 | ||||
| -rw-r--r-- | bin/gensquashfs/selinux.c (renamed from mkfs/selinux.c) | 0 | ||||
| -rw-r--r-- | bin/rdsquashfs/describe.c (renamed from unpack/describe.c) | 0 | ||||
| -rw-r--r-- | bin/rdsquashfs/dump_xattrs.c (renamed from unpack/dump_xattrs.c) | 0 | ||||
| -rw-r--r-- | bin/rdsquashfs/fill_files.c (renamed from unpack/fill_files.c) | 0 | ||||
| -rw-r--r-- | bin/rdsquashfs/list_files.c (renamed from unpack/list_files.c) | 0 | ||||
| -rw-r--r-- | bin/rdsquashfs/options.c (renamed from unpack/options.c) | 0 | ||||
| -rw-r--r-- | bin/rdsquashfs/rdsquashfs.c (renamed from unpack/rdsquashfs.c) | 0 | ||||
| -rw-r--r-- | bin/rdsquashfs/rdsquashfs.h (renamed from unpack/rdsquashfs.h) | 0 | ||||
| -rw-r--r-- | bin/rdsquashfs/restore_fstree.c (renamed from unpack/restore_fstree.c) | 0 | ||||
| -rw-r--r-- | bin/sqfs2tar.c (renamed from tar/sqfs2tar.c) | 0 | ||||
| -rw-r--r-- | bin/sqfsdiff/compare_dir.c (renamed from difftool/compare_dir.c) | 0 | ||||
| -rw-r--r-- | bin/sqfsdiff/compare_files.c (renamed from difftool/compare_files.c) | 0 | ||||
| -rw-r--r-- | bin/sqfsdiff/extract.c (renamed from difftool/extract.c) | 0 | ||||
| -rw-r--r-- | bin/sqfsdiff/node_compare.c (renamed from difftool/node_compare.c) | 0 | ||||
| -rw-r--r-- | bin/sqfsdiff/options.c (renamed from difftool/options.c) | 0 | ||||
| -rw-r--r-- | bin/sqfsdiff/sqfsdiff.c (renamed from difftool/sqfsdiff.c) | 0 | ||||
| -rw-r--r-- | bin/sqfsdiff/sqfsdiff.h (renamed from difftool/sqfsdiff.h) | 0 | ||||
| -rw-r--r-- | bin/sqfsdiff/super.c (renamed from difftool/super.c) | 0 | ||||
| -rw-r--r-- | bin/sqfsdiff/util.c (renamed from difftool/util.c) | 0 | ||||
| -rw-r--r-- | bin/tar2sqfs.c (renamed from tar/tar2sqfs.c) | 0 | ||||
| -rw-r--r-- | difftool/Makemodule.am | 9 | ||||
| -rw-r--r-- | mkfs/Makemodule.am | 13 | ||||
| -rw-r--r-- | tar/Makemodule.am | 12 | ||||
| -rw-r--r-- | unpack/Makemodule.am | 9 |
30 files changed, 43 insertions, 47 deletions
diff --git a/Makefile.am b/Makefile.am index 7d4f9ba..7b62028 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,10 +29,7 @@ include lib/common/Makemodule.am include lib/tar/Makemodule.am include lib/compat/Makemodule.am include lib/util/Makemodule.am -include tar/Makemodule.am -include mkfs/Makemodule.am -include unpack/Makemodule.am -include difftool/Makemodule.am +include bin/Makemodule.am endif include extras/Makemodule.am diff --git a/bin/Makemodule.am b/bin/Makemodule.am new file mode 100644 index 0000000..4199ac5 --- /dev/null +++ b/bin/Makemodule.am @@ -0,0 +1,42 @@ +sqfs2tar_SOURCES = bin/sqfs2tar.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.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 +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 + +bin_PROGRAMS += sqfs2tar tar2sqfs gensquashfs rdsquashfs sqfsdiff diff --git a/mkfs/dirscan.c b/bin/gensquashfs/dirscan.c index dbc862c..dbc862c 100644 --- a/mkfs/dirscan.c +++ b/bin/gensquashfs/dirscan.c diff --git a/mkfs/mkfs.c b/bin/gensquashfs/mkfs.c index 9ffbb94..9ffbb94 100644 --- a/mkfs/mkfs.c +++ b/bin/gensquashfs/mkfs.c diff --git a/mkfs/mkfs.h b/bin/gensquashfs/mkfs.h index 1b767aa..1b767aa 100644 --- a/mkfs/mkfs.h +++ b/bin/gensquashfs/mkfs.h diff --git a/mkfs/options.c b/bin/gensquashfs/options.c index 2369787..2369787 100644 --- a/mkfs/options.c +++ b/bin/gensquashfs/options.c diff --git a/mkfs/selinux.c b/bin/gensquashfs/selinux.c index 678723b..678723b 100644 --- a/mkfs/selinux.c +++ b/bin/gensquashfs/selinux.c diff --git a/unpack/describe.c b/bin/rdsquashfs/describe.c index d30f844..d30f844 100644 --- a/unpack/describe.c +++ b/bin/rdsquashfs/describe.c diff --git a/unpack/dump_xattrs.c b/bin/rdsquashfs/dump_xattrs.c index 93b0b01..93b0b01 100644 --- a/unpack/dump_xattrs.c +++ b/bin/rdsquashfs/dump_xattrs.c diff --git a/unpack/fill_files.c b/bin/rdsquashfs/fill_files.c index b75afbf..b75afbf 100644 --- a/unpack/fill_files.c +++ b/bin/rdsquashfs/fill_files.c diff --git a/unpack/list_files.c b/bin/rdsquashfs/list_files.c index 238ffec..238ffec 100644 --- a/unpack/list_files.c +++ b/bin/rdsquashfs/list_files.c diff --git a/unpack/options.c b/bin/rdsquashfs/options.c index cdd19e1..cdd19e1 100644 --- a/unpack/options.c +++ b/bin/rdsquashfs/options.c diff --git a/unpack/rdsquashfs.c b/bin/rdsquashfs/rdsquashfs.c index fa2bbb4..fa2bbb4 100644 --- a/unpack/rdsquashfs.c +++ b/bin/rdsquashfs/rdsquashfs.c diff --git a/unpack/rdsquashfs.h b/bin/rdsquashfs/rdsquashfs.h index 17c0a85..17c0a85 100644 --- a/unpack/rdsquashfs.h +++ b/bin/rdsquashfs/rdsquashfs.h diff --git a/unpack/restore_fstree.c b/bin/rdsquashfs/restore_fstree.c index 8f99439..8f99439 100644 --- a/unpack/restore_fstree.c +++ b/bin/rdsquashfs/restore_fstree.c diff --git a/tar/sqfs2tar.c b/bin/sqfs2tar.c index 6d2a51a..6d2a51a 100644 --- a/tar/sqfs2tar.c +++ b/bin/sqfs2tar.c diff --git a/difftool/compare_dir.c b/bin/sqfsdiff/compare_dir.c index 1a4c800..1a4c800 100644 --- a/difftool/compare_dir.c +++ b/bin/sqfsdiff/compare_dir.c diff --git a/difftool/compare_files.c b/bin/sqfsdiff/compare_files.c index 51b66bb..51b66bb 100644 --- a/difftool/compare_files.c +++ b/bin/sqfsdiff/compare_files.c diff --git a/difftool/extract.c b/bin/sqfsdiff/extract.c index 979572a..979572a 100644 --- a/difftool/extract.c +++ b/bin/sqfsdiff/extract.c diff --git a/difftool/node_compare.c b/bin/sqfsdiff/node_compare.c index 59d1831..59d1831 100644 --- a/difftool/node_compare.c +++ b/bin/sqfsdiff/node_compare.c diff --git a/difftool/options.c b/bin/sqfsdiff/options.c index b8ce7f0..b8ce7f0 100644 --- a/difftool/options.c +++ b/bin/sqfsdiff/options.c diff --git a/difftool/sqfsdiff.c b/bin/sqfsdiff/sqfsdiff.c index 2871322..2871322 100644 --- a/difftool/sqfsdiff.c +++ b/bin/sqfsdiff/sqfsdiff.c diff --git a/difftool/sqfsdiff.h b/bin/sqfsdiff/sqfsdiff.h index 94fce93..94fce93 100644 --- a/difftool/sqfsdiff.h +++ b/bin/sqfsdiff/sqfsdiff.h diff --git a/difftool/super.c b/bin/sqfsdiff/super.c index 111412a..111412a 100644 --- a/difftool/super.c +++ b/bin/sqfsdiff/super.c diff --git a/difftool/util.c b/bin/sqfsdiff/util.c index 5e9161a..5e9161a 100644 --- a/difftool/util.c +++ b/bin/sqfsdiff/util.c diff --git a/tar/tar2sqfs.c b/bin/tar2sqfs.c index 6025dc9..6025dc9 100644 --- a/tar/tar2sqfs.c +++ b/bin/tar2sqfs.c diff --git a/difftool/Makemodule.am b/difftool/Makemodule.am deleted file mode 100644 index ba597b3..0000000 --- a/difftool/Makemodule.am +++ /dev/null @@ -1,9 +0,0 @@ -sqfsdiff_SOURCES = difftool/sqfsdiff.c difftool/sqfsdiff.h difftool/util.c -sqfsdiff_SOURCES += difftool/compare_dir.c difftool/node_compare.c -sqfsdiff_SOURCES += difftool/compare_files.c difftool/super.c -sqfsdiff_SOURCES += difftool/extract.c difftool/options.c -sqfsdiff_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -sqfsdiff_LDADD = libcommon.a libsquashfs.la libcompat.a $(LZO_LIBS) libfstree.a -sqfsdiff_LDADD += $(PTHREAD_LIBS) - -bin_PROGRAMS += sqfsdiff diff --git a/mkfs/Makemodule.am b/mkfs/Makemodule.am deleted file mode 100644 index 34f3d76..0000000 --- a/mkfs/Makemodule.am +++ /dev/null @@ -1,13 +0,0 @@ -gensquashfs_SOURCES = mkfs/mkfs.c mkfs/mkfs.h mkfs/options.c -gensquashfs_SOURCES += mkfs/dirscan.c mkfs/selinux.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 - -bin_PROGRAMS += gensquashfs diff --git a/tar/Makemodule.am b/tar/Makemodule.am deleted file mode 100644 index e065ef7..0000000 --- a/tar/Makemodule.am +++ /dev/null @@ -1,12 +0,0 @@ -sqfs2tar_SOURCES = tar/sqfs2tar.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 = tar/tar2sqfs.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) - -bin_PROGRAMS += sqfs2tar tar2sqfs diff --git a/unpack/Makemodule.am b/unpack/Makemodule.am deleted file mode 100644 index 94aa0b2..0000000 --- a/unpack/Makemodule.am +++ /dev/null @@ -1,9 +0,0 @@ -rdsquashfs_SOURCES = unpack/rdsquashfs.c unpack/rdsquashfs.h -rdsquashfs_SOURCES += unpack/list_files.c unpack/options.c -rdsquashfs_SOURCES += unpack/restore_fstree.c unpack/describe.c -rdsquashfs_SOURCES += unpack/fill_files.c unpack/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) - -bin_PROGRAMS += rdsquashfs |