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>

1 files changed, 4 insertions, 33 deletions

diff --git a/ubi-utils/Makemodule.am b/ubi-utils/Makemodule.am
index f1c50df..215eac2 100644
--- 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