Move ubi-utils libraries to common library location

Historically, the mtd-utils and ubi-utils were seperate packages. The
ubi-utils were at some point merged into the mtd-utils. They first
appeared in the release tar-ball in version 1.1.0 in their own
sub-hirarchy with their own buildsystem, readme, documentation, etc.
A lot of the duplicated stuff got centralized/removed over time.

This patch further cleans up the directory hirarchy duplication by
moving common libraries from the ubi-utils/ into the central lib/
and include/ directories in the top directory of the mtd-utils package.

This includes:
 - libuib.a & libubigen.a used by the ubi utilities
 - libscan.a currently only used by ubiformat
 - libiniparser.a used by ubinize

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

diff --git a/ubi-utils/include/dictionary.h b/include/dictionary.h
similarity index 100%
rename from ubi-utils/include/dictionary.h
rename to include/dictionary.h

diff --git a/ubi-utils/include/libiniparser.h b/include/libiniparser.h
similarity index 100%
rename from ubi-utils/include/libiniparser.h
rename to include/libiniparser.h

diff --git a/ubi-utils/include/libscan.h b/include/libscan.h
similarity index 100%
rename from ubi-utils/include/libscan.h
rename to include/libscan.h

diff --git a/ubi-utils/include/libubi.h b/include/libubi.h
similarity index 100%
rename from ubi-utils/include/libubi.h
rename to include/libubi.h

diff --git a/ubi-utils/include/libubigen.h b/include/libubigen.h
similarity index 100%
rename from ubi-utils/include/libubigen.h
rename to include/libubigen.h

diff --git a/ubi-utils/LICENSE.libiniparser b/lib/LICENSE.libiniparser
similarity index 100%
rename from ubi-utils/LICENSE.libiniparser
rename to lib/LICENSE.libiniparser

diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 694a151d43c5861e59681179524c95eae4bad046..5bee5b686abe85be1f47d6cfc523efe343af9724 100644 (file)
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -9,4 +9,22 @@ libmtd_a_SOURCES = \
 libmissing_a_SOURCES = \
        lib/execinfo.c
 
+libubi_a_SOURCES = \
+       lib/libubi.c \
+       lib/libubi_int.h
+
+libubigen_a_SOURCES = \
+       lib/libubigen.c
+
+libscan_a_SOURCES = \
+       lib/libscan.c
+
+libiniparser_a_SOURCES = \
+       lib/libiniparser.c \
+       lib/dictionary.c
+
+EXTRA_DIST += lib/LICENSE.libiniparser
+
 noinst_LIBRARIES += libmtd.a libmissing.a
+noinst_LIBRARIES += libubi.a libubigen.a libscan.a
+noinst_LIBRARIES += libiniparser.a

diff --git a/ubi-utils/dictionary.c b/lib/dictionary.c
similarity index 100%
rename from ubi-utils/dictionary.c
rename to lib/dictionary.c

diff --git a/ubi-utils/libiniparser.c b/lib/libiniparser.c
similarity index 100%
rename from ubi-utils/libiniparser.c
rename to lib/libiniparser.c

diff --git a/ubi-utils/libscan.c b/lib/libscan.c
similarity index 100%
rename from ubi-utils/libscan.c
rename to lib/libscan.c

diff --git a/ubi-utils/libubi.c b/lib/libubi.c
similarity index 100%
rename from ubi-utils/libubi.c
rename to lib/libubi.c

diff --git a/ubi-utils/libubi_int.h b/lib/libubi_int.h
similarity index 100%
rename from ubi-utils/libubi_int.h
rename to lib/libubi_int.h

diff --git a/ubi-utils/libubigen.c b/lib/libubigen.c
similarity index 100%
rename from ubi-utils/libubigen.c
rename to lib/libubigen.c

diff --git a/tests/unittests/Makemodule.am b/tests/unittests/Makemodule.am
index b7bad94b354ffeee747a0a646c7d58821b442f36..8099fc2f2a402c571ef7a428fee3e1ebdd6ab448 100644 (file)
--- a/tests/unittests/Makemodule.am
+++ b/tests/unittests/Makemodule.am
@@ -1,7 +1,7 @@
-ubilib_test_SOURCES = tests/unittests/libubi_test.c ubi-utils/libubi.c
+ubilib_test_SOURCES = tests/unittests/libubi_test.c lib/libubi.c
 ubilib_test_LDADD = $(CMOCKA_LIBS)
 ubilib_test_LDFLAGS = -Wl,--wrap=open -Wl,--wrap=close -Wl,--wrap=stat -Wl,--wrap=ioctl -Wl,--wrap=read -Wl,--wrap=lseek
-ubilib_test_CPPFLAGS = -O0 --std=gnu99 $(CMOCKA_CFLAGS) -I ubi-utils/include -I include -DSYSFS_ROOT='"tests/unittests/sysfs_mock"'
+ubilib_test_CPPFLAGS = -O0 --std=gnu99 $(CMOCKA_CFLAGS) -I include -DSYSFS_ROOT='"tests/unittests/sysfs_mock"'
 
 mtdlib_test_SOURCES = tests/unittests/libmtd_test.c lib/libmtd.c lib/libmtd_legacy.c
 mtdlib_test_LDADD = $(CMOCKA_LIBS)

diff --git a/ubi-utils/Makemodule.am b/ubi-utils/Makemodule.am
index f1c50df97743776dae8200abcd0ca41f3bf71639..215eac27f5a5740d3c720d128133e5b243b1c6a5 100644 (file)
--- a/ubi-utils/Makemodule.am
+++ b/ubi-utils/Makemodule.am
@@ -1,78 +1,49 @@
-libubi_a_SOURCES = ubi-utils/libubi.c ubi-utils/libubi_int.h
-libubi_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
-
-libubigen_a_SOURCES = ubi-utils/libubigen.c
-libubigen_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
-
 ubiupdatevol_SOURCES = ubi-utils/ubiupdatevol.c
 ubiupdatevol_LDADD = libmtd.a libubi.a
-ubiupdatevol_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
 
 ubimkvol_SOURCES = ubi-utils/ubimkvol.c
 ubimkvol_LDADD = libmtd.a libubi.a
-ubimkvol_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
 
 ubirmvol_SOURCES = ubi-utils/ubirmvol.c
 ubirmvol_LDADD = libmtd.a libubi.a
-ubirmvol_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
 
 ubicrc32_SOURCES = ubi-utils/ubicrc32.c
 ubicrc32_LDADD = libmtd.a libubi.a
-ubicrc32_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
 
 ubinfo_SOURCES = ubi-utils/ubinfo.c
 ubinfo_LDADD = libmtd.a libubi.a
-ubinfo_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
 
 ubiattach_SOURCES = ubi-utils/ubiattach.c
 ubiattach_LDADD = libmtd.a libubi.a
-ubiattach_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
 
 ubidetach_SOURCES = ubi-utils/ubidetach.c
 ubidetach_LDADD = libmtd.a libubi.a
-ubidetach_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
 
-ubinize_SOURCES = ubi-utils/ubinize.c ubi-utils/libiniparser.c ubi-utils/dictionary.c
-ubinize_LDADD = libubi.a libubigen.a libmtd.a
-ubinize_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
+ubinize_SOURCES = ubi-utils/ubinize.c
+ubinize_LDADD = libubi.a libubigen.a libmtd.a libiniparser.a
 
-ubiformat_SOURCES = ubi-utils/ubiformat.c ubi-utils/libscan.c
-ubiformat_LDADD = libubi.a libubigen.a libmtd.a
-ubiformat_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
+ubiformat_SOURCES = ubi-utils/ubiformat.c
+ubiformat_LDADD = libubi.a libubigen.a libmtd.a libscan.a
 
 ubirename_SOURCES = ubi-utils/ubirename.c
 ubirename_LDADD = libmtd.a libubi.a
-ubirename_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
 
 mtdinfo_SOURCES = ubi-utils/mtdinfo.c
 mtdinfo_LDADD = libubi.a libubigen.a libmtd.a
-mtdinfo_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
 
 ubirsvol_SOURCES = ubi-utils/ubirsvol.c
 ubirsvol_LDADD = libmtd.a libubi.a
-ubirsvol_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
 
 ubiblock_SOURCES = ubi-utils/ubiblock.c
 ubiblock_LDADD = libmtd.a libubi.a
-ubiblock_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
 
 UBI_BINS = \
        ubiupdatevol ubimkvol ubirmvol ubicrc32 ubinfo ubiattach \
        ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol ubiblock
 
-UBI_EXTRA = \
-       ubi-utils/LICENSE.libiniparser
-
-UBI_HEADER = \
-       ubi-utils/include ubi-utils/libubi_int.h
-
 UBI_MAN = \
        ubi-utils/ubinize.8
 
-EXTRA_DIST += $(UBI_HEADER) $(UBI_EXTRA)
-
 dist_man8_MANS += $(UBI_MAN)
 
 sbin_PROGRAMS += $(UBI_BINS)
-
-noinst_LIBRARIES += libubi.a libubigen.a