aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ubifs-utils/Makemodule.am4
-rw-r--r--ubifs-utils/common/ubifs.h2
-rw-r--r--ubifs-utils/libubifs/ubifs-media.h (renamed from include/mtd/ubifs-media.h)0
3 files changed, 3 insertions, 3 deletions
diff --git a/ubifs-utils/Makemodule.am b/ubifs-utils/Makemodule.am
index 3211d84..92b3dde 100644
--- a/ubifs-utils/Makemodule.am
+++ b/ubifs-utils/Makemodule.am
@@ -31,7 +31,7 @@ common_SOURCES = \
ubifs-utils/common/lpt.c \
ubifs-utils/common/super.c \
ubifs-utils/common/sign.h \
- include/mtd/ubifs-media.h
+ ubifs-utils/libubifs/ubifs-media.h
if WITH_CRYPTO
common_SOURCES += ubifs-utils/common/crypto.c \
@@ -48,7 +48,7 @@ mkfs_ubifs_SOURCES = \
mkfs_ubifs_LDADD = libmtd.a libubi.a $(ZLIB_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(UUID_LIBS) $(LIBSELINUX_LIBS) $(OPENSSL_LIBS) \
$(DUMP_STACK_LD) -lm -lpthread
mkfs_ubifs_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS) $(ZSTD_CFLAGS) $(UUID_CFLAGS) $(LIBSELINUX_CFLAGS) \
- -I$(top_srcdir)/ubi-utils/include -I$(top_srcdir)/ubifs-utils/common
+ -I$(top_srcdir)/ubi-utils/include -I$(top_srcdir)/ubifs-utils/common -I $(top_srcdir)/ubifs-utils/libubifs
EXTRA_DIST += ubifs-utils/common/README
diff --git a/ubifs-utils/common/ubifs.h b/ubifs-utils/common/ubifs.h
index 5a909f6..ed297cc 100644
--- a/ubifs-utils/common/ubifs.h
+++ b/ubifs-utils/common/ubifs.h
@@ -25,7 +25,7 @@
#ifndef __UBIFS_H__
#define __UBIFS_H__
-#include <mtd/ubifs-media.h>
+#include "ubifs-media.h"
#include "libubi.h"
/* Maximum logical eraseblock size in bytes */
diff --git a/include/mtd/ubifs-media.h b/ubifs-utils/libubifs/ubifs-media.h
index f1e3a14..f1e3a14 100644
--- a/include/mtd/ubifs-media.h
+++ b/ubifs-utils/libubifs/ubifs-media.h