summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am5
-rw-r--r--jffsX-utils/Makemodule.am17
-rw-r--r--lib/Makemodule.am30
-rw-r--r--misc-utils/Makemodule.am23
-rw-r--r--nand-utils/Makemodule.am6
-rw-r--r--nor-utils/Makemodule.am2
-rw-r--r--tests/checkfs/Makemodule.am6
-rw-r--r--tests/fs-tests/Makemodule.am30
-rw-r--r--tests/ubi-tests/Makemodule.am15
-rw-r--r--tests/unittests/Makemodule.am7
-rw-r--r--ubi-utils/Makemodule.am2
-rw-r--r--ubifs-utils/Makemodule.am18
12 files changed, 87 insertions, 74 deletions
diff --git a/Makefile.am b/Makefile.am
index 4fdcd70..8a169fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,13 +40,10 @@ dist_man8_MANS =
TESTS =
EXTRA_DIST =
-GLOBAL_HEADER = \
- include
-
GLOBAL_EXTRA = \
COPYING
-EXTRA_DIST += $(GLOBAL_HEADER) $(GLOBAL_EXTRA)
+EXTRA_DIST += $(GLOBAL_EXTRA)
include lib/Makemodule.am
include ubi-utils/Makemodule.am
diff --git a/jffsX-utils/Makemodule.am b/jffsX-utils/Makemodule.am
index 9fd734b..64a969d 100644
--- a/jffsX-utils/Makemodule.am
+++ b/jffsX-utils/Makemodule.am
@@ -7,18 +7,24 @@ mkfs_jffs2_SOURCES = \
jffsX-utils/compr_lzo.c \
jffsX-utils/compr.c \
jffsX-utils/compr_rtime.c
+ jffsX-utils/compr.h \
+ jffsX-utils/rbtree.h \
+ jffsX-utils/summary.h \
+ include/linux/jffs2.h \
+ include/mtd/jffs2-user.h
mkfs_jffs2_LDADD = libmtd.a $(ZLIB_LIBS) $(LZO_LIBS)
mkfs_jffs2_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS)
-jffs2reader_SOURCES = jffsX-utils/jffs2reader.c
+jffs2reader_SOURCES = jffsX-utils/jffs2reader.c include/mtd/jffs2-user.h
jffs2reader_LDADD = libmtd.a $(ZLIB_LIBS) $(LZO_LIBS)
jffs2reader_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS)
-jffs2dump_SOURCES = jffsX-utils/jffs2dump.c
+jffs2dump_SOURCES = jffsX-utils/jffs2dump.c include/mtd/jffs2-user.h
+jffs2dump_SOURCES += jffsX-utils/summary.h
jffs2dump_LDADD = libmtd.a $(ZLIB_LIBS) $(LZO_LIBS)
jffs2dump_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS)
-sumtool_SOURCES = jffsX-utils/sumtool.c
+sumtool_SOURCES = jffsX-utils/sumtool.c jffsX-utils/summary.h
sumtool_LDADD = libmtd.a
JFFSX_BINS = \
@@ -30,10 +36,7 @@ JFFSX_MAN = \
JFFSX_EXTRA = \
jffsX-utils/device_table.txt jffsX-utils/mkfs.jffs2.1
-JFFSX_HEADER = \
- jffsX-utils/compr.h jffsX-utils/rbtree.h jffsX-utils/summary.h
-
-EXTRA_DIST += $(JFFSX_HEADER) $(JFFSX_EXTRA)
+EXTRA_DIST += $(JFFSX_EXTRA)
dist_man1_MANS += $(JFFSX_MAN)
sbin_PROGRAMS += $(JFFSX_BINS)
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 5bee5b6..570896b 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -1,27 +1,45 @@
libmtd_a_SOURCES = \
lib/libmtd.c \
+ include/libmtd.h \
lib/libfec.c \
+ include/libfec.h \
lib/common.c \
+ include/common.h \
lib/libcrc32.c \
+ include/crc32.h \
lib/libmtd_legacy.c \
- lib/libmtd_int.h
+ lib/libmtd_int.h \
+ include/xalloc.h \
+ include/mtd/mtd-user.h \
+ include/mtd/mtd-abi.h
libmissing_a_SOURCES = \
- lib/execinfo.c
+ lib/execinfo.c \
+ include/libmissing.h
libubi_a_SOURCES = \
lib/libubi.c \
- lib/libubi_int.h
+ lib/libubi_int.h \
+ include/libubi.h \
+ include/mtd/ubi-user.h
libubigen_a_SOURCES = \
- lib/libubigen.c
+ lib/libubigen.c \
+ include/libubigen.h \
+ include/mtd_swab.h \
+ include/mtd/ubi-media.h
libscan_a_SOURCES = \
- lib/libscan.c
+ lib/libscan.c \
+ include/libscan.h \
+ include/mtd_swab.h \
+ include/mtd/ubi-media.h
libiniparser_a_SOURCES = \
lib/libiniparser.c \
- lib/dictionary.c
+ include/libiniparser.h \
+ lib/dictionary.c \
+ include/dictionary.h
EXTRA_DIST += lib/LICENSE.libiniparser
diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index 9a86f6f..50703b6 100644
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -1,22 +1,25 @@
-ftl_format_SOURCES = misc-utils/ftl_format.c
+ftl_format_SOURCES = misc-utils/ftl_format.c include/mtd_swab.h
+ftl_format_SOURCES += include/mtd/ftl-user.h
doc_loadbios_SOURCES = misc-utils/doc_loadbios.c
-ftl_check_SOURCES = misc-utils/ftl_check.c
+ftl_check_SOURCES = misc-utils/ftl_check.c include/mtd_swab.h
+ftl_check_SOURCES += include/mtd/ftl-user.h
mtd_debug_SOURCES = misc-utils/mtd_debug.c
mtdpart_SOURCES = misc-utils/mtdpart.c
-docfdisk_SOURCES = misc-utils/docfdisk.c
+docfdisk_SOURCES = misc-utils/docfdisk.c include/mtd_swab.h
+docfdisk_SOURCES += include/mtd/inftl-user.h include/mtd/ftl-user.h
-serve_image_SOURCES = misc-utils/serve_image.c
+serve_image_SOURCES = misc-utils/serve_image.c misc-utils/mcast_image.h
serve_image_LDADD = libmtd.a
-recv_image_SOURCES = misc-utils/recv_image.c
+recv_image_SOURCES = misc-utils/recv_image.c misc-utils/mcast_image.h
recv_image_LDADD = libmtd.a
-fectest_SOURCES = misc-utils/fectest.c
+fectest_SOURCES = misc-utils/fectest.c misc-utils/mcast_image.h
fectest_LDADD = libmtd.a
flash_lock_SOURCES = misc-utils/flash_lock.c
@@ -48,14 +51,10 @@ MISC_SH = \
MISC_EXTRA = \
misc-utils/MAKEDEV
-MISC_HEADER = \
- misc-utils/mcast_image.h \
- misc-utils/lsmtd.h
-
MISC_MAN =
if BUILD_LSMTD
-lsmtd_SOURCES = misc-utils/lsmtd.c misc-utils/lsmtd_scan.c
+lsmtd_SOURCES = misc-utils/lsmtd.c misc-utils/lsmtd_scan.c misc-utils/lsmtd.h
lsmtd_LDADD = libmtd.a libubi.a
lsmtd_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/misc-utils
@@ -63,7 +62,7 @@ MISC_BINS += lsmtd
MISC_MAN += misc-utils/lsmtd.8
endif
-EXTRA_DIST += $(MISC_HEADER) $(MISC_EXTRA) $(MISC_SH)
+EXTRA_DIST += $(MISC_EXTRA) $(MISC_SH)
dist_man8_MANS += $(MISC_MAN)
sbin_PROGRAMS += $(MISC_BINS)
diff --git a/nand-utils/Makemodule.am b/nand-utils/Makemodule.am
index b5a15ac..439b37d 100644
--- a/nand-utils/Makemodule.am
+++ b/nand-utils/Makemodule.am
@@ -7,10 +7,12 @@ nandwrite_LDADD = libmtd.a
nandtest_SOURCES = nand-utils/nandtest.c
nandtest_LDADD = libmtd.a
-nftldump_SOURCES = nand-utils/nftldump.c
+nftldump_SOURCES = nand-utils/nftldump.c include/mtd_swab.h
+nftldump_SOURCES += include/mtd/nftl-user.h include/mtd/ftl-user.h
nftldump_LDADD = libmtd.a
-nftl_format_SOURCES = nand-utils/nftl_format.c
+nftl_format_SOURCES = nand-utils/nftl_format.c include/mtd_swab.h
+nftl_format_SOURCES += include/mtd/nftl-user.h include/mtd/ftl-user.h
nftl_format_LDADD = libmtd.a
nandflipbits_SOURCES = nand-utils/nandflipbits.c
diff --git a/nor-utils/Makemodule.am b/nor-utils/Makemodule.am
index a5a0d4d..ef46cf8 100644
--- a/nor-utils/Makemodule.am
+++ b/nor-utils/Makemodule.am
@@ -1,4 +1,4 @@
-rfddump_SOURCES = nor-utils/rfddump.c
+rfddump_SOURCES = nor-utils/rfddump.c include/mtd_swab.h
rfddump_LDADD = libmtd.a
rfdformat_SOURCES = nor-utils/rfdformat.c
diff --git a/tests/checkfs/Makemodule.am b/tests/checkfs/Makemodule.am
index 6e1314f..64ab869 100644
--- a/tests/checkfs/Makemodule.am
+++ b/tests/checkfs/Makemodule.am
@@ -1,4 +1,5 @@
checkfs_SOURCES = tests/checkfs/checkfs.c tests/checkfs/comm.c
+checkfs_SOURCES += tests/checkfs/common.h
checkfs_CPPFLAGS = $(AM_CPPFLAGS)
makefiles_SOURCES = tests/checkfs/makefiles.c
@@ -7,13 +8,10 @@ makefiles_CPPFLAGS = $(AM_CPPFLAGS)
CHECKFS_BINS = \
makefiles checkfs
-CHECKFS_HEADER = \
- tests/checkfs/common.h
-
CHECKFS_EXTRA = \
tests/checkfs/README
-EXTRA_DIST += $(CHECKFS_EXTRA) $(CHECKFS_HEADER)
+EXTRA_DIST += $(CHECKFS_EXTRA)
if INSTALL_TESTS
pkglibexec_PROGRAMS += $(CHECKFS_BINS)
diff --git a/tests/fs-tests/Makemodule.am b/tests/fs-tests/Makemodule.am
index 2eae860..506dadc 100644
--- a/tests/fs-tests/Makemodule.am
+++ b/tests/fs-tests/Makemodule.am
@@ -3,58 +3,63 @@ integck_LDADD = libubi.a libmissing.a
integck_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
test_1_SOURCES = tests/fs-tests/simple/test_1.c tests/fs-tests/lib/tests.c
+test_1_SOURCES += tests/fs-tests/lib/tests.h
test_1_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib
test_2_SOURCES = tests/fs-tests/simple/test_2.c tests/fs-tests/lib/tests.c
+test_2_SOURCES += tests/fs-tests/lib/tests.h
test_2_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib
ftrunc_SOURCES = tests/fs-tests/simple/ftrunc.c tests/fs-tests/lib/tests.c
+ftrunc_SOURCES += tests/fs-tests/lib/tests.h
ftrunc_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib
perf_SOURCES = tests/fs-tests/simple/perf.c tests/fs-tests/lib/tests.c
+perf_SOURCES += tests/fs-tests/lib/tests.h
perf_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib
orph_SOURCES = tests/fs-tests/simple/orph.c tests/fs-tests/lib/tests.c
+orph_SOURCES += tests/fs-tests/lib/tests.h
orph_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib
stress_1_SOURCES = tests/fs-tests/stress/atoms/stress_1.c
-stress_1_SOURCES += tests/fs-tests/lib/tests.c
+stress_1_SOURCES += tests/fs-tests/lib/tests.c tests/fs-tests/lib/tests.h
stress_1_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib
stress_2_SOURCES = tests/fs-tests/stress/atoms/stress_2.c
-stress_2_SOURCES += tests/fs-tests/lib/tests.c
+stress_2_SOURCES += tests/fs-tests/lib/tests.c tests/fs-tests/lib/tests.h
stress_2_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib
stress_3_SOURCES = tests/fs-tests/stress/atoms/stress_3.c
-stress_3_SOURCES += tests/fs-tests/lib/tests.c
+stress_3_SOURCES += tests/fs-tests/lib/tests.c tests/fs-tests/lib/tests.h
stress_3_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib
pdfrun_SOURCES = tests/fs-tests/stress/atoms/pdfrun.c
-pdfrun_SOURCES += tests/fs-tests/lib/tests.c
+pdfrun_SOURCES += tests/fs-tests/lib/tests.c tests/fs-tests/lib/tests.h
pdfrun_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib
rndwrite00_SOURCES = tests/fs-tests/stress/atoms/rndwrite00.c
-rndwrite00_SOURCES += tests/fs-tests/lib/tests.c
+rndwrite00_SOURCES += tests/fs-tests/lib/tests.c tests/fs-tests/lib/tests.h
rndwrite00_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib
fwrite00_SOURCES = tests/fs-tests/stress/atoms/fwrite00.c
-fwrite00_SOURCES += tests/fs-tests/lib/tests.c
+fwrite00_SOURCES += tests/fs-tests/lib/tests.c tests/fs-tests/lib/tests.h
fwrite00_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib
rmdir00_SOURCES = tests/fs-tests/stress/atoms/rmdir00.c
-rmdir00_SOURCES += tests/fs-tests/lib/tests.c
+rmdir00_SOURCES += tests/fs-tests/lib/tests.c tests/fs-tests/lib/tests.h
rmdir00_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib
rndrm00_SOURCES = tests/fs-tests/stress/atoms/rndrm00.c
-rndrm00_SOURCES += tests/fs-tests/lib/tests.c
+rndrm00_SOURCES += tests/fs-tests/lib/tests.c tests/fs-tests/lib/tests.h
rndrm00_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib
rndrm99_SOURCES = tests/fs-tests/stress/atoms/rndrm99.c
-rndrm99_SOURCES += tests/fs-tests/lib/tests.c
+rndrm99_SOURCES += tests/fs-tests/lib/tests.c tests/fs-tests/lib/tests.h
rndrm99_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib
gcd_hupper_SOURCES = tests/fs-tests/stress/atoms/gcd_hupper.c
-gcd_hupper_SOURCES += tests/fs-tests/lib/tests.c
+gcd_hupper_SOURCES += tests/fs-tests/lib/tests.c tests/fs-tests/lib/tests.h
gcd_hupper_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib
fstest_monitor_SOURCES = tests/fs-tests/utils/fstest_monitor.c
@@ -72,11 +77,6 @@ FSTEST_SH = \
tests/fs-tests/stress/fs_stress00.sh \
tests/fs-tests/stress/fs_stress01.sh
-FSTEST_HEADER = \
- tests/fs-tests/lib/tests.h
-
-EXTRA_DIST += $(FSTEST_HEADER)
-
if INSTALL_TESTS
pkglibexec_SCRIPTS += $(FSTEST_SH)
pkglibexec_PROGRAMS += $(FSTEST_BINS)
diff --git a/tests/ubi-tests/Makemodule.am b/tests/ubi-tests/Makemodule.am
index d1fbab7..fe835ed 100644
--- a/tests/ubi-tests/Makemodule.am
+++ b/tests/ubi-tests/Makemodule.am
@@ -1,12 +1,15 @@
io_basic_SOURCES = tests/ubi-tests/io_basic.c tests/ubi-tests/helpers.c
+io_basic_SOURCES += tests/ubi-tests/helpers.h
io_basic_LDADD = libubi.a
io_basic_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
io_update_SOURCES = tests/ubi-tests/io_update.c tests/ubi-tests/helpers.c
+io_update_SOURCES += tests/ubi-tests/helpers.h
io_update_LDADD = libubi.a
io_update_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
io_paral_SOURCES = tests/ubi-tests/io_paral.c tests/ubi-tests/helpers.c
+io_paral_SOURCES += tests/ubi-tests/helpers.h
io_paral_LDADD = libubi.a $(PTHREAD_LIBS)
io_paral_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
@@ -14,26 +17,32 @@ io_paral_LDADD += $(PTHREAD_CFLAGS)
io_paral_CPPFLAGS += $(PTHREAD_CFLAGS)
io_read_SOURCES = tests/ubi-tests/io_read.c tests/ubi-tests/helpers.c
+io_read_SOURCES += tests/ubi-tests/helpers.h
io_read_LDADD = libubi.a
io_read_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
volrefcnt_SOURCES = tests/ubi-tests/volrefcnt.c tests/ubi-tests/helpers.c
+volrefcnt_SOURCES += tests/ubi-tests/helpers.h
volrefcnt_LDADD = libubi.a
volrefcnt_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
integ_SOURCES = tests/ubi-tests/integ.c tests/ubi-tests/helpers.c
+integ_SOURCES += tests/ubi-tests/helpers.h
integ_LDADD = libubi.a
integ_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
mkvol_basic_SOURCES = tests/ubi-tests/mkvol_basic.c tests/ubi-tests/helpers.c
+mkvol_basic_SOURCES += tests/ubi-tests/helpers.h
mkvol_basic_LDADD = libubi.a
mkvol_basic_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
mkvol_bad_SOURCES = tests/ubi-tests/mkvol_bad.c tests/ubi-tests/helpers.c
+mkvol_bad_SOURCES += tests/ubi-tests/helpers.h
mkvol_bad_LDADD = libubi.a
mkvol_bad_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
mkvol_paral_SOURCES = tests/ubi-tests/mkvol_paral.c tests/ubi-tests/helpers.c
+mkvol_paral_SOURCES += tests/ubi-tests/helpers.h
mkvol_paral_LDADD = libubi.a $(PTHREAD_LIBS)
mkvol_paral_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
@@ -41,6 +50,7 @@ mkvol_paral_LDADD += $(PTHREAD_CFLAGS)
mkvol_paral_CPPFLAGS += $(PTHREAD_CFLAGS)
rsvol_SOURCES = tests/ubi-tests/rsvol.c tests/ubi-tests/helpers.c
+rsvol_SOURCES += tests/ubi-tests/helpers.h
rsvol_LDADD = libubi.a
rsvol_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
@@ -51,11 +61,6 @@ UBITEST_BINS = \
UBITEST_SH = \
tests/ubi-tests/runubitests.sh tests/ubi-tests/ubi-stress-test.sh
-UBITEST_HEADER = \
- tests/ubi-tests/helpers.h
-
-EXTRA_DIST += $(UBITEST_HEADER)
-
if INSTALL_TESTS
pkglibexec_SCRIPTS += $(UBITEST_SH)
pkglibexec_PROGRAMS += $(UBITEST_BINS)
diff --git a/tests/unittests/Makemodule.am b/tests/unittests/Makemodule.am
index df1041d..cadd1bc 100644
--- a/tests/unittests/Makemodule.am
+++ b/tests/unittests/Makemodule.am
@@ -1,9 +1,11 @@
ubilib_test_SOURCES = tests/unittests/libubi_test.c lib/libubi.c
+ubilib_test_SOURCES += tests/unittests/test_lib.h
ubilib_test_LDADD = $(CMOCKA_LIBS)
ubilib_test_LDFLAGS = -Wl,--wrap=open -Wl,--wrap=close -Wl,--wrap=ioctl -Wl,--wrap=read -Wl,--wrap=lseek
ubilib_test_CPPFLAGS = -O0 --std=gnu99 $(CMOCKA_CFLAGS) -I$(top_srcdir)/include -DSYSFS_ROOT='"$(top_srcdir)/tests/unittests/sysfs_mock"'
mtdlib_test_SOURCES = tests/unittests/libmtd_test.c lib/libmtd.c lib/libmtd_legacy.c
+mtdlib_test_SOURCES += tests/unittests/test_lib.h
mtdlib_test_LDADD = $(CMOCKA_LIBS)
mtdlib_test_LDFLAGS = -Wl,--wrap=open -Wl,--wrap=close -Wl,--wrap=ioctl -Wl,--wrap=read -Wl,--wrap=lseek -Wl,--wrap=write
mtdlib_test_CPPFLAGS = -O0 -D_GNU_SOURCE --std=gnu99 $(CMOCKA_CFLAGS) -I$(top_srcdir)/lib/ -I$(top_srcdir)/include -DSYSFS_ROOT='"$(top_srcdir)/tests/unittests/sysfs_mock"'
@@ -12,13 +14,10 @@ TEST_BINS = \
ubilib_test \
mtdlib_test
-UNITTEST_HEADER = \
- tests/unittests/test_lib.h
-
UNITTEST_EXTRA = \
tests/unittests/sysfs_mock
-EXTRA_DIST += $(UNITTEST_HEADER) $(UNITTEST_EXTRA)
+EXTRA_DIST += $(UNITTEST_EXTRA)
TESTS += $(TEST_BINS)
check_PROGRAMS += $(TEST_BINS)
diff --git a/ubi-utils/Makemodule.am b/ubi-utils/Makemodule.am
index 2835702..00d5d8f 100644
--- a/ubi-utils/Makemodule.am
+++ b/ubi-utils/Makemodule.am
@@ -22,7 +22,7 @@ ubidetach_LDADD = libmtd.a libubi.a
ubinize_SOURCES = ubi-utils/ubinize.c
ubinize_LDADD = libubi.a libubigen.a libmtd.a libiniparser.a
-ubiformat_SOURCES = ubi-utils/ubiformat.c
+ubiformat_SOURCES = ubi-utils/ubiformat.c include/mtd_swab.h
ubiformat_LDADD = libubi.a libubigen.a libmtd.a libscan.a
ubirename_SOURCES = ubi-utils/ubirename.c
diff --git a/ubifs-utils/Makemodule.am b/ubifs-utils/Makemodule.am
index 5c5d99f..feedb7c 100644
--- a/ubifs-utils/Makemodule.am
+++ b/ubifs-utils/Makemodule.am
@@ -16,11 +16,14 @@ mkfs_ubifs_SOURCES = \
ubifs-utils/mkfs.ubifs/hashtable/hashtable_private.h \
ubifs-utils/mkfs.ubifs/hashtable/hashtable.c \
ubifs-utils/mkfs.ubifs/hashtable/hashtable_itr.c \
- ubifs-utils/mkfs.ubifs/devtable.c
+ ubifs-utils/mkfs.ubifs/devtable.c \
+ include/mtd/ubifs-media.h
if WITH_CRYPTO
mkfs_ubifs_SOURCES += ubifs-utils/mkfs.ubifs/crypto.c \
+ ubifs-utils/mkfs.ubifs/crypto.h \
ubifs-utils/mkfs.ubifs/fscrypt.c \
+ ubifs-utils/mkfs.ubifs/fscrypt.h \
ubifs-utils/mkfs.ubifs/sign.c
endif
@@ -31,21 +34,10 @@ mkfs_ubifs_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS) $(ZSTD_CFLAGS)
UBIFS_BINS = \
mkfs.ubifs
-UBIFS_HEADER = \
- ubifs-utils/mkfs.ubifs/compr.h ubifs-utils/mkfs.ubifs/crc16.h \
- ubifs-utils/mkfs.ubifs/defs.h ubifs-utils/mkfs.ubifs/key.h \
- ubifs-utils/mkfs.ubifs/lpt.h ubifs-utils/mkfs.ubifs/mkfs.ubifs.h \
- ubifs-utils/mkfs.ubifs/ubifs.h \
- ubifs-utils/mkfs.ubifs/crypto.h \
- ubifs-utils/mkfs.ubifs/fscrypt.h \
- ubifs-utils/mkfs.ubifs/hashtable/hashtable.h \
- ubifs-utils/mkfs.ubifs/hashtable/hashtable_itr.h \
- ubifs-utils/mkfs.ubifs/hashtable/hashtable_private.h
-
UBIFS_EXTRA = \
ubifs-utils/mkfs.ubifs/README
-EXTRA_DIST += $(UBIFS_HEADER) $(UBIFS_EXTRA)
+EXTRA_DIST += $(UBIFS_EXTRA)
dist_sbin_SCRIPTS = ubifs-utils/mount.ubifs