From 7d968dfad95c6f8de97fc770c5c9562ad96a9ad3 Mon Sep 17 00:00:00 2001
From: "S.J.R. van Schaik" <stephan@whiteboxsystems.nl>
Date: Tue, 1 Aug 2017 17:03:34 +0200
Subject: [PATCH] make: mufs: re-organise code and add separate Makefile

---
 Makefile                     | 7 -------
 source/Makefile              | 1 +
 source/mufs/Makefile         | 6 ++++++
 source/{fs => }/mufs/block.c | 0
 source/{fs => }/mufs/block.h | 0
 source/{fs => }/mufs/dir.c   | 0
 source/{fs => }/mufs/dir.h   | 0
 source/{fs => }/mufs/file.c  | 0
 source/{fs => }/mufs/path.c  | 0
 source/{fs => }/mufs/path.h  | 0
 source/{fs => }/mufs/super.c | 0
 source/{fs => }/mufs/tree.c  | 0
 source/{fs => }/mufs/tree.h  | 0
 13 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 source/mufs/Makefile
 rename source/{fs => }/mufs/block.c (100%)
 rename source/{fs => }/mufs/block.h (100%)
 rename source/{fs => }/mufs/dir.c (100%)
 rename source/{fs => }/mufs/dir.h (100%)
 rename source/{fs => }/mufs/file.c (100%)
 rename source/{fs => }/mufs/path.c (100%)
 rename source/{fs => }/mufs/path.h (100%)
 rename source/{fs => }/mufs/super.c (100%)
 rename source/{fs => }/mufs/tree.c (100%)
 rename source/{fs => }/mufs/tree.h (100%)

diff --git a/Makefile b/Makefile
index 16b3afc..c621ed1 100644
--- a/Makefile
+++ b/Makefile
@@ -29,13 +29,6 @@ obj-y += source/main.o
 
 obj-y += source/core/flash.o
 
-obj-y += source/fs/mufs/block.o
-obj-y += source/fs/mufs/dir.o
-obj-y += source/fs/mufs/file.o
-obj-y += source/fs/mufs/path.o
-obj-y += source/fs/mufs/super.o
-obj-y += source/fs/mufs/tree.o
-
 obj = $(addprefix $(BUILD)/, $(obj-y))
 
 # Include the dependencies.
diff --git a/source/Makefile b/source/Makefile
index de7e067..d9c728f 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -1,3 +1,4 @@
 -include source/ftl/Makefile
+-include source/mufs/Makefile
 -include source/platform/Makefile
 -include source/shell/Makefile
diff --git a/source/mufs/Makefile b/source/mufs/Makefile
new file mode 100644
index 0000000..29c9739
--- /dev/null
+++ b/source/mufs/Makefile
@@ -0,0 +1,6 @@
+obj-y += source/mufs/block.o
+obj-y += source/mufs/dir.o
+obj-y += source/mufs/file.o
+obj-y += source/mufs/path.o
+obj-y += source/mufs/super.o
+obj-y += source/mufs/tree.o
diff --git a/source/fs/mufs/block.c b/source/mufs/block.c
similarity index 100%
rename from source/fs/mufs/block.c
rename to source/mufs/block.c
diff --git a/source/fs/mufs/block.h b/source/mufs/block.h
similarity index 100%
rename from source/fs/mufs/block.h
rename to source/mufs/block.h
diff --git a/source/fs/mufs/dir.c b/source/mufs/dir.c
similarity index 100%
rename from source/fs/mufs/dir.c
rename to source/mufs/dir.c
diff --git a/source/fs/mufs/dir.h b/source/mufs/dir.h
similarity index 100%
rename from source/fs/mufs/dir.h
rename to source/mufs/dir.h
diff --git a/source/fs/mufs/file.c b/source/mufs/file.c
similarity index 100%
rename from source/fs/mufs/file.c
rename to source/mufs/file.c
diff --git a/source/fs/mufs/path.c b/source/mufs/path.c
similarity index 100%
rename from source/fs/mufs/path.c
rename to source/mufs/path.c
diff --git a/source/fs/mufs/path.h b/source/mufs/path.h
similarity index 100%
rename from source/fs/mufs/path.h
rename to source/mufs/path.h
diff --git a/source/fs/mufs/super.c b/source/mufs/super.c
similarity index 100%
rename from source/fs/mufs/super.c
rename to source/mufs/super.c
diff --git a/source/fs/mufs/tree.c b/source/mufs/tree.c
similarity index 100%
rename from source/fs/mufs/tree.c
rename to source/mufs/tree.c
diff --git a/source/fs/mufs/tree.h b/source/mufs/tree.h
similarity index 100%
rename from source/fs/mufs/tree.h
rename to source/mufs/tree.h