From bb8648e7a0b9ea2213e44f17084cb8f98ce1cbf4 Mon Sep 17 00:00:00 2001
From: anchao <anchao@pinecone.net>
Date: Tue, 19 Mar 2019 10:14:50 -0600
Subject: [PATCH] ibs/libc/Makefile, libs/libnx/Makefile, and mm/Makefile: 
 Remove obj-path MKDEPS option since make dependency target (MT) is not
 supported by some toolchains.

---
 libs/libc/Makefile  | 18 +++++++++---------
 libs/libnx/Makefile | 18 +++++++++---------
 mm/Makefile         | 18 +++++++++---------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/libs/libc/Makefile b/libs/libc/Makefile
index d7e14baacc..47a6c0dc11 100644
--- a/libs/libc/Makefile
+++ b/libs/libc/Makefile
@@ -149,10 +149,10 @@ endif
 
 .depend: Makefile $(SRCS)
 ifeq ($(CONFIG_BUILD_FLAT),y)
-	$(Q) $(MKDEP) --obj-path bin --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make_bin.dep
+	$(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >bin/Make.dep
 else
-	$(Q) $(MKDEP) --obj-path ubin --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make_ubin.dep
-	$(Q) $(MKDEP) --obj-path kbin --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) $(KDEFINE) -- $(SRCS) >Make_kbin.dep
+	$(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >ubin/Make.dep
+	$(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) $(KDEFINE) -- $(SRCS) >kbin/Make.dep
 endif
 ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
 	$(Q) $(MAKE) -C zoneinfo depend TOPDIR=$(TOPDIR) BIN=$(BIN)
@@ -180,11 +180,11 @@ distclean: clean
 	$(Q) $(MAKE) -C ubin distclean TOPDIR=$(TOPDIR)
 	$(Q) $(MAKE) -C kbin distclean TOPDIR=$(TOPDIR)
 	$(Q) $(MAKE) -C zoneinfo distclean TOPDIR=$(TOPDIR) BIN=$(BIN)
-	$(call DELFILE, Make_bin.dep)
-	$(call DELFILE, Make_ubin.dep)
-	$(call DELFILE, Make_kbin.dep)
+	$(call DELFILE, bin/Make.dep)
+	$(call DELFILE, ubin/Make.dep)
+	$(call DELFILE, kbin/Make.dep)
 	$(call DELFILE, .depend)
 
--include Make_bin.dep
--include Make_ubin.dep
--include Make_kbin.dep
+-include bin/Make.dep
+-include ubin/Make.dep
+-include kbin/Make.dep
diff --git a/libs/libnx/Makefile b/libs/libnx/Makefile
index 6324853438..0673ba0a6a 100644
--- a/libs/libnx/Makefile
+++ b/libs/libnx/Makefile
@@ -262,10 +262,10 @@ endif
 
 .depend: Makefile gensources $(SRCS)
 ifeq ($(CONFIG_BUILD_FLAT),y)
-	$(Q) $(MKDEP) --obj-path bin --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make_bin.dep
+	$(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >bin/Make.dep
 else
-	$(Q) $(MKDEP) --obj-path ubin --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make_ubin.dep
-	$(Q) $(MKDEP) --obj-path kbin --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) $(KDEFINE) -- $(SRCS) >Make_kbin.dep
+	$(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >ubin/Make.dep
+	$(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) $(KDEFINE) -- $(SRCS) >kbin/Make.dep
 endif
 	$(Q) touch $@
 
@@ -294,11 +294,11 @@ distclean: clean
 	$(Q) $(MAKE) -C ubin distclean TOPDIR=$(TOPDIR)
 	$(Q) $(MAKE) -C kbin distclean TOPDIR=$(TOPDIR)
 	$(Q) $(MAKE) -C nxfonts -f Makefile.sources distclean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES)
-	$(call DELFILE, Make_bin.dep)
-	$(call DELFILE, Make_ubin.dep)
-	$(call DELFILE, Make_kbin.dep)
+	$(call DELFILE, bin/Make.dep)
+	$(call DELFILE, ubin/Make.dep)
+	$(call DELFILE, kbin/Make.dep)
 	$(call DELFILE, .depend)
 
--include Make_bin.dep
--include Make_ubin.dep
--include Make_kbin.dep
+-include bin/Make.dep
+-include ubin/Make.dep
+-include kbin/Make.dep
diff --git a/mm/Makefile b/mm/Makefile
index a0eeeb1a21..2e334142e1 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -109,10 +109,10 @@ endif
 
 .depend: Makefile $(SRCS)
 ifeq ($(CONFIG_BUILD_FLAT),y)
-	$(Q) $(MKDEP) --obj-path bin --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make_bin.dep
+	$(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >bin/Make.dep
 else
-	$(Q) $(MKDEP) --obj-path ubin --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make_ubin.dep
-	$(Q) $(MKDEP) --obj-path kbin --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) $(KDEFINE) -- $(SRCS) >Make_kbin.dep
+	$(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >ubin/Make.dep
+	$(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) $(KDEFINE) -- $(SRCS) >kbin/Make.dep
 endif
 	$(Q) touch $@
 
@@ -135,11 +135,11 @@ distclean: clean
 	$(Q) $(MAKE) -C bin  distclean TOPDIR=$(TOPDIR)
 	$(Q) $(MAKE) -C ubin distclean TOPDIR=$(TOPDIR)
 	$(Q) $(MAKE) -C kbin distclean TOPDIR=$(TOPDIR)
-	$(call DELFILE, Make_bin.dep)
-	$(call DELFILE, Make_ubin.dep)
-	$(call DELFILE, Make_kbin.dep)
+	$(call DELFILE, bin/Make.dep)
+	$(call DELFILE, ubin/Make.dep)
+	$(call DELFILE, kbin/Make.dep)
 	$(call DELFILE, .depend)
 
--include Make_bin.dep
--include Make_ubin.dep
--include Make_kbin.dep
+-include bin/Make.dep
+-include ubin/Make.dep
+-include kbin/Make.dep