From 0d1973075deafd5272f0cb9801f273d16e1736d9 Mon Sep 17 00:00:00 2001
From: GoldenTails <milestailsprower101n2@gmail.com>
Date: Thu, 24 Dec 2020 03:22:08 -0600
Subject: [PATCH 1/9] Nice UDB config there, SRB2.

---
 extras/conf/udb/Includes/SRB222_things.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extras/conf/udb/Includes/SRB222_things.cfg b/extras/conf/udb/Includes/SRB222_things.cfg
index 0ea452155..113c1a4c2 100644
--- a/extras/conf/udb/Includes/SRB222_things.cfg
+++ b/extras/conf/udb/Includes/SRB222_things.cfg
@@ -1247,6 +1247,7 @@ patterns
 		sprite = "SPHRA0";
 		width = 96;
 		height = 192;
+	}
 	609
 	{
 		title = "Circle of Rings and Spheres (Big)";

From 3003c252d12651111498e47eb9d372c0e8794a75 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 18 Feb 2021 05:16:15 -0800
Subject: [PATCH 2/9] Makfile: don't print some messages twice

---
 src/Makefile     | 10 +++++++---
 src/Makefile.cfg | 10 ++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 42b757940..1186fe915 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,7 +2,7 @@
 #     GNU Make makefile for SRB2
 #############################################################################
 # Copyright (C) 1998-2000 by DooM Legacy Team.
-# Copyright (C) 2003-2020 by Sonic Team Junior.
+# Copyright (C) 2003-2021 by Sonic Team Junior.
 #
 # This program is free software distributed under the
 # terms of the GNU General Public License, version 2.
@@ -79,6 +79,10 @@
 #
 #############################################################################
 
+ifndef MAKE_RESTARTS
+print=$(info $(1))
+endif
+
 ALL_SYSTEMS=\
 	PANDORA\
 	LINUX64\
@@ -98,7 +102,7 @@ ALL_SYSTEMS=\
 ifeq (,$(filter $(ALL_SYSTEMS),$(.VARIABLES)))
 ifeq ($(OS),Windows_NT) # all windows are Windows_NT...
 
- $(info Detected a Windows system, compiling for 32-bit MinGW SDL2...)
+ $(call print,Detected a Windows system, compiling for 32-bit MinGW SDL2...)
 
  # go for a 32-bit sdl mingw exe by default
  MINGW=1
@@ -123,7 +127,7 @@ else # if you on the *nix
  new_system:=$(new_system)64
  endif
 
- $(info Detected $(system) ($(new_system))...)
+ $(call print,Detected $(system) ($(new_system))...)
  $(new_system)=1
 
 endif
diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index f081eacdf..c323f4ffd 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -60,12 +60,14 @@ ifeq   (,$(filter GCC%,$(.VARIABLES)))
 
   # If this version is not in the list, default to the latest supported
   ifeq (,$(filter $(v),$(SUPPORTED_GCC_VERSIONS)))
-   $(info\
-		Your compiler version, GCC $(version), is not supported by the Makefile.\
-		The Makefile will assume GCC $(LATEST_GCC_VERSION).)
+	define line =
+	Your compiler version, GCC $(version), is not supported by the Makefile.
+	The Makefile will assume GCC $(LATEST_GCC_VERSION).))
+	endef
+   $(call print,$(line))
    GCC$(subst .,,$(LATEST_GCC_VERSION))=1
   else
-   $(info Detected GCC $(version) (GCC$(v)))
+   $(call print,Detected GCC $(version) (GCC$(v)))
    GCC$(v)=1
   endif
  endif

From 3d32f3145cf1bec85f77c33908a8bfc6772bd779 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 18 Feb 2021 06:15:11 -0800
Subject: [PATCH 3/9] Generate individual dependency files

This removes Makefile.depends. Instead, '.d' files are included from the 'dep'
directory. This speeds up building because dependencies for every file don't
need to be regenerated if only one changes.

As a bonus, dependencies also won't be generated if only clean type targets
are going to be run. Also added a 'distclean' target, which cleans both
objects and dependency files.
---
 src/Makefile     | 57 ++++++++++++++++++++++++------------------------
 src/Makefile.cfg | 13 +++++++++++
 2 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 1186fe915..3e8c33624 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -24,7 +24,9 @@
 #     clean
 #       Remove all object files
 #     cleandep
-#       Remove depend.dep
+#       Remove dependency files
+#     distclean
+#       Remove autogenerated files
 #     dll
 #       compile primary HW render DLL/SO
 #     all_dll
@@ -459,7 +461,6 @@ DBGNAME?=$(EXENAME).debug
 
 # not too sophisticated dependency
 OBJS:=$(i_main_o) \
-		$(OBJDIR)/comptime.o \
 		$(OBJDIR)/string.o   \
 		$(OBJDIR)/d_main.o   \
 		$(OBJDIR)/d_clisrv.o \
@@ -539,6 +540,8 @@ OBJS:=$(i_main_o) \
 		$(i_sound_o)    \
 		$(OBJS)
 
+DEPS:=$(patsubst $(OBJDIR)/%.o,$(DEPDIR)/%.d,$(OBJS))
+OBJS+=$(OBJDIR)/comptime.o
 
 ifndef ECHO
 ifndef NOECHOFILENAMES
@@ -559,12 +562,12 @@ OPTS+=-DGETTEXT
 endif
 
 ifdef PANDORA
-all:	pre-build $(BIN)/$(PNDNAME)
+all: $(BIN)/$(PNDNAME)
 endif
 
 
 ifdef SDL
-all:	 pre-build $(BIN)/$(EXENAME)
+all: $(BIN)/$(EXENAME)
 endif
 
 ifdef DUMMY
@@ -572,20 +575,15 @@ all:	$(BIN)/$(EXENAME)
 endif
 
 cleandep:
-	$(REMOVE) $(OBJDIR)/depend.dep
+	$(REMOVE) $(DEPS)
 	$(REMOVE) comptime.h
 
-pre-build:
-ifdef WINDOWSHELL
-	-..\comptime.bat .
-else
-	-@../comptime.sh .
-endif
-
 clean:
 	$(REMOVE) *~ *.flc
 	$(REMOVE) $(OBJDIR)/*.o
 
+distclean: clean cleandep
+
 ifdef MINGW
 	$(REMOVE) $(OBJDIR)/*.res
 endif
@@ -667,24 +665,21 @@ endif
 endif
 
 #dependecy made by gcc itself !
-$(OBJS):
 ifndef DUMMY
--include $(OBJDIR)/depend.dep
+ifneq (,$(filter-out cleandep clean distclean,$(or $(MAKECMDGOALS),all)))
+$(call print,Checking dependency files...)
+-include $(DEPS)
+endif
 endif
 
-$(OBJDIR)/depend.dep:
-	@echo "Creating dependency file, depend.dep"
-	@echo > comptime.h
-	-$(MKDIR) $(OBJDIR)
-	$(CC) $(CFLAGS) -MM *.c > $(OBJDIR)/depend.ped
-	$(CC) $(CFLAGS) -MM $(INTERFACE)/*.c >> $(OBJDIR)/depend.ped
-ifndef NOHW
-	$(CC) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped
+$(DEPDIR)/%.d: %.c
+# windows makes it too hard !
+ifndef WINDOWSHELL
+ifndef ECHO
+	@printf "%-20.20s\r" $<
 endif
-	$(CC) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped
-	@sed -e 's,\(.*\)\.o: ,$(subst /,\/,$(OBJDIR))\/&,g' < $(OBJDIR)/depend.ped > $(OBJDIR)/depend.dep
-	$(REMOVE) $(OBJDIR)/depend.ped
-	@echo "Created dependency file, depend.dep"
+endif
+	$(CC) $(CFLAGS) -M -MF $@ -MT $(OBJDIR)/$< $<
 
 ifdef VALGRIND
 $(OBJDIR)/z_zone.o: z_zone.c
@@ -692,9 +687,13 @@ $(OBJDIR)/z_zone.o: z_zone.c
 	$(CC) $(CFLAGS) $(WFLAGS) -DHAVE_VALGRIND $(VALGRIND_CFLAGS) -c $< -o $@
 endif
 
-$(OBJDIR)/comptime.o: comptime.c pre-build
-	$(echoName)
-	$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
+$(OBJDIR)/comptime.o::
+ifdef WINDOWSHELL
+	-..\comptime.bat .
+else
+	-../comptime.sh .
+endif
+	$(CC) $(CFLAGS) $(WFLAGS) -c comptime.c -o $@
 
 $(BIN)/%.mo: locale/%.po
 	-$(MKDIR) $(BIN)
diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index c323f4ffd..ec19e9f85 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -363,6 +363,7 @@ i_main_o=$(OBJDIR)/i_main.o
 #set OBJDIR and BIN's starting place
 OBJDIR=../objs
 BIN=../bin
+DEPDIR=../dep
 #Nasm ASM and rm
 ifdef YASM
 NASM?=yasm
@@ -385,6 +386,7 @@ ifdef DUMMY
 	INTERFACE=dummy
 	OBJDIR:=$(OBJDIR)/dummy
 	BIN:=$(BIN)/dummy
+	DEPDIR:=$(DEPDIR)/dummy
 else
 ifdef LINUX
 	NASMFORMAT=elf -DLINUX
@@ -392,9 +394,11 @@ ifdef LINUX
 ifdef LINUX64
 	OBJDIR:=$(OBJDIR)/Linux64
 	BIN:=$(BIN)/Linux64
+	DEPDIR:=$(DEPDIR)/Linux64
 else
 	OBJDIR:=$(OBJDIR)/Linux
 	BIN:=$(BIN)/Linux
+	DEPDIR:=$(DEPDIR)/Linux
 endif
 else
 ifdef FREEBSD
@@ -404,6 +408,7 @@ ifdef FREEBSD
 
 	OBJDIR:=$(OBJDIR)/FreeBSD
 	BIN:=$(BIN)/FreeBSD
+	DEPDIR:=$(DEPDIR)/Linux
 else
 ifdef SOLARIS
 	INTERFACE=sdl
@@ -412,6 +417,7 @@ ifdef SOLARIS
 
 	OBJDIR:=$(OBJDIR)/Solaris
 	BIN:=$(BIN)/Solaris
+	DEPDIR:=$(DEPDIR)/Solaris
 else
 ifdef CYGWIN32
 	INTERFACE=sdl
@@ -420,18 +426,21 @@ ifdef CYGWIN32
 
 	OBJDIR:=$(OBJDIR)/cygwin
 	BIN:=$(BIN)/Cygwin
+	DEPDIR:=$(DEPDIR)/Cygwin
 else
 ifdef MINGW64
 	#NASMFORMAT=win64
 	SDL=1
 	OBJDIR:=$(OBJDIR)/Mingw64
 	BIN:=$(BIN)/Mingw64
+	DEPDIR:=$(DEPDIR)/Mingw64
 else
 ifdef MINGW
 	NASMFORMAT=win32
 	SDL=1
 	OBJDIR:=$(OBJDIR)/Mingw
 	BIN:=$(BIN)/Mingw
+	DEPDIR:=$(DEPDIR)/Mingw
 endif
 endif
 endif
@@ -443,6 +452,7 @@ endif
 ifdef ARCHNAME
 	OBJDIR:=$(OBJDIR)/$(ARCHNAME)
 	BIN:=$(BIN)/$(ARCHNAME)
+	DEPDIR:=$(DEPDIR)/$(ARCHNAME)
 endif
 
 OBJDUMP_OPTS?=--wide --source --line-numbers
@@ -451,14 +461,17 @@ LD=$(CC)
 ifdef SDL
 	INTERFACE=sdl
 	OBJDIR:=$(OBJDIR)/SDL
+	DEPDIR:=$(DEPDIR)/SDL
 endif
 
 ifndef DUMMY
 ifdef DEBUGMODE
 	OBJDIR:=$(OBJDIR)/Debug
 	BIN:=$(BIN)/Debug
+	DEPDIR:=$(DEPDIR)/Debug
 else
 	OBJDIR:=$(OBJDIR)/Release
 	BIN:=$(BIN)/Release
+	DEPDIR:=$(DEPDIR)/Release
 endif
 endif

From 747c278bc2380d5f48c0c939de1ef3994d44b6c4 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 18 Feb 2021 07:03:25 -0800
Subject: [PATCH 4/9] Makefile: add a SILENT flag

This makes it print nothing to stdout.

Also fixed some irregularities.
---
 src/Makefile     | 37 ++++++++++++++++++++++++++-----------
 src/Makefile.cfg |  3 ++-
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 3e8c33624..260175a69 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -81,9 +81,16 @@
 #
 #############################################################################
 
+,=,
+
+ifeq (,$(filter-out cleandep clean distclean,$(or $(MAKECMDGOALS),all)))
+CLEANONLY=1
+else ifndef SILENT
+echo=@echo "$(1)"
 ifndef MAKE_RESTARTS
 print=$(info $(1))
 endif
+endif
 
 ALL_SYSTEMS=\
 	PANDORA\
@@ -104,7 +111,7 @@ ALL_SYSTEMS=\
 ifeq (,$(filter $(ALL_SYSTEMS),$(.VARIABLES)))
 ifeq ($(OS),Windows_NT) # all windows are Windows_NT...
 
- $(call print,Detected a Windows system, compiling for 32-bit MinGW SDL2...)
+ $(call print,Detected a Windows system$(,) compiling for 32-bit MinGW SDL2...)
 
  # go for a 32-bit sdl mingw exe by default
  MINGW=1
@@ -243,6 +250,12 @@ endif
 
 MSGFMT?=msgfmt
 
+ifdef WINDOWSHELL
+	COMPTIME=-..\comptime.bat
+else
+	COMPTIME=-../comptime.sh
+endif
+
 ifndef ECHO
 	NASM:=@$(NASM)
 	REMOVE:=@$(REMOVE)
@@ -257,6 +270,7 @@ ifndef ECHO
 	MSGFMT:=@$(MSGFMT)
 	UPX:=@$(UPX)
 	UPX_OPTS+=-q
+	COMPTIME:=@$(COMPTIME)
 endif
 
 ifdef NONET
@@ -543,6 +557,7 @@ OBJS:=$(i_main_o) \
 DEPS:=$(patsubst $(OBJDIR)/%.o,$(DEPDIR)/%.d,$(OBJS))
 OBJS+=$(OBJDIR)/comptime.o
 
+ifndef SILENT
 ifndef ECHO
 ifndef NOECHOFILENAMES
 define echoName =
@@ -550,6 +565,7 @@ define echoName =
 endef
 endif
 endif
+endif
 
 # List of languages to compile.
 # For reference, this is the command I use to build a srb2.pot file from the source code.
@@ -603,11 +619,11 @@ asm:
 
 $(BIN)/$(EXENAME): $(POS) $(OBJS)
 	-$(MKDIR) $(BIN)
-	@echo Linking $(EXENAME)...
+	$(call echo,Linking $(EXENAME)...)
 	$(LD) $(LDFLAGS) $(OBJS) -o $(BIN)/$(EXENAME) $(LIBS)
 ifndef VALGRIND
 ifndef NOOBJDUMP
-	@echo Dumping debugging info
+	$(call echo,Dumping debugging info)
 	$(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(EXENAME) > $(BIN)/$(DBGNAME).txt
 ifdef WINDOWSHELL
 	-$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt
@@ -626,10 +642,10 @@ ifndef NOUPX
 	-$(UPX) $(UPX_OPTS) $(BIN)/$(EXENAME)
 endif
 endif
-	@echo Build is done, please look for $(EXENAME) in $(BIN), \(checking for post steps\)
+	$(call echo,Build is done$(,) please look for $(EXENAME) in $(BIN)$(,) (checking for post steps))
 
 reobjdump:
-	@echo Redumping debugging info
+	$(call echo,Redumping debugging info)
 	$(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(DBGNAME) > $(BIN)/$(DBGNAME).txt
 ifdef WINDOWSHELL
 	-$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt
@@ -666,7 +682,7 @@ endif
 
 #dependecy made by gcc itself !
 ifndef DUMMY
-ifneq (,$(filter-out cleandep clean distclean,$(or $(MAKECMDGOALS),all)))
+ifndef CLEANONLY
 $(call print,Checking dependency files...)
 -include $(DEPS)
 endif
@@ -675,7 +691,7 @@ endif
 $(DEPDIR)/%.d: %.c
 # windows makes it too hard !
 ifndef WINDOWSHELL
-ifndef ECHO
+ifdef echoName
 	@printf "%-20.20s\r" $<
 endif
 endif
@@ -688,11 +704,10 @@ $(OBJDIR)/z_zone.o: z_zone.c
 endif
 
 $(OBJDIR)/comptime.o::
-ifdef WINDOWSHELL
-	-..\comptime.bat .
-else
-	-../comptime.sh .
+ifdef echoName
+	@echo -- comptime.c ...
 endif
+	$(COMPTIME) .
 	$(CC) $(CFLAGS) $(WFLAGS) -c comptime.c -o $@
 
 $(BIN)/%.mo: locale/%.po
diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index ec19e9f85..075cd2d3a 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -47,7 +47,8 @@ ifdef MACOSX
 endif
 
 # Automatically set version flag, but not if one was manually set
-ifeq   (,$(filter GCC%,$(.VARIABLES)))
+# And don't bother if this is a clean only run
+ifeq   (,$(filter GCC% CLEANONLY,$(.VARIABLES)))
  version:=$(shell $(CC) --version)
  # check if this is in fact GCC
  ifneq (,$(or $(findstring gcc,$(version)),$(findstring GCC,$(version))))

From 5b1dc6ba338ac1f1401d38ce1d82aeb082ad3dff Mon Sep 17 00:00:00 2001
From: Jaime Ita Passos <jp6781615@gmail.com>
Date: Wed, 24 Feb 2021 23:45:39 -0300
Subject: [PATCH 5/9] [Meta] Change branding

---
 src/d_netcmd.c         | 4 ++--
 src/m_misc.c           | 6 +++---
 src/sdl/i_system.c     | 8 ++++----
 src/sdl/i_video.c      | 2 +-
 src/win32/Makefile.cfg | 2 +-
 src/win32/Srb2win.rc   | 6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 4208e4c4f..8d42ca4c2 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -3477,9 +3477,9 @@ static void Command_ListWADS_f(void)
 static void Command_Version_f(void)
 {
 #ifdef DEVELOP
-	CONS_Printf("Sonic Robo Blast 2 %s-%s (%s %s) ", compbranch, comprevision, compdate, comptime);
+	CONS_Printf("Kitchen Sink Faucet %s-%s (%s %s) ", compbranch, comprevision, compdate, comptime);
 #else
-	CONS_Printf("Sonic Robo Blast 2 %s (%s %s %s %s) ", VERSIONSTRING, compdate, comptime, comprevision, compbranch);
+	CONS_Printf("Kitchen Sink Faucet %s (%s %s %s %s) ", VERSIONSTRING, compdate, comptime, comprevision, compbranch);
 #endif
 
 	// Base library
diff --git a/src/m_misc.c b/src/m_misc.c
index 42890cb08..376e7512f 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -783,10 +783,10 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png
 	char keytxt[SRB2PNGTXT][12] = {
 	"Title", "Description", "Playername", "Mapnum", "Mapname",
 	"Location", "Interface", "Render Mode", "Revision", "Build Date", "Build Time"};
-	char titletxt[] = "Sonic Robo Blast 2 " VERSIONSTRING;
+	char titletxt[] = "Kitchen Sink Faucet " VERSIONSTRING;
 	png_charp playertxt =  cv_playername.zstring;
-	char desctxt[] = "SRB2 Screenshot";
-	char Movietxt[] = "SRB2 Movie";
+	char desctxt[] = "Kitchen Sink Faucet Screenshot";
+	char Movietxt[] = "Kitchen Sink Faucet Movie";
 	size_t i;
 	char interfacetxt[] =
 #ifdef HAVE_SDL
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 10c0747bf..1c47b89c9 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -629,7 +629,7 @@ static void I_StartupConsole(void)
 
 	if (gotConsole)
 	{
-		SetConsoleTitleA("SRB2 Console");
+		SetConsoleTitleA("Kitchen Sink Faucet Console");
 		consolevent = SDL_TRUE;
 	}
 
@@ -1622,7 +1622,7 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
 		return;
 
 	if(mumble->uiVersion != 2) {
-		wcsncpy(mumble->name, L"SRB2 "VERSIONSTRINGW, 256);
+		wcsncpy(mumble->name, L"Kitchen Sink Faucet "VERSIONSTRINGW, 256);
 		wcsncpy(mumble->description, L"Sonic Robo Blast 2 with integrated Mumble Link support.", 2048);
 		mumble->uiVersion = 2;
 	}
@@ -2400,7 +2400,7 @@ void I_Error(const char *error, ...)
 			// which should fail gracefully if it can't put a message box up
 			// on the target system
 			SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
-				"SRB2 "VERSIONSTRING" Recursive Error",
+				"Kitchen Sink Faucet Recursive Error",
 				buffer, NULL);
 
 			W_Shutdown();
@@ -2444,7 +2444,7 @@ void I_Error(const char *error, ...)
 	// which should fail gracefully if it can't put a message box up
 	// on the target system
 	SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
-		"SRB2 "VERSIONSTRING" Error",
+		"Kitchen Sink Faucet Error",
 		buffer, NULL);
 	// Note that SDL_ShowSimpleMessageBox does *not* require SDL to be
 	// initialized at the time, so calling it after SDL_Quit() is
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index c8f67da77..032521c0a 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1631,7 +1631,7 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
 #endif
 
 	// Create a window
-	window = SDL_CreateWindow("SRB2 "VERSIONSTRING, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+	window = SDL_CreateWindow("Kitchen Sink Faucet "VERSIONSTRING, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
 			realwidth, realheight, flags);
 
 
diff --git a/src/win32/Makefile.cfg b/src/win32/Makefile.cfg
index 702ae3765..0365f617d 100644
--- a/src/win32/Makefile.cfg
+++ b/src/win32/Makefile.cfg
@@ -68,7 +68,7 @@ endif
 endif
 
 	# name of the exefile
-	EXENAME?=srb2win.exe
+	EXENAME?=kitchensinkfaucet.exe
 
 ifdef SDL
 	i_system_o+=$(OBJDIR)/SRB2.res
diff --git a/src/win32/Srb2win.rc b/src/win32/Srb2win.rc
index 5ba366bda..98927e2a6 100644
--- a/src/win32/Srb2win.rc
+++ b/src/win32/Srb2win.rc
@@ -84,14 +84,14 @@ BEGIN
         BEGIN
             VALUE "Comments", "Visit our web site at www.srb2.org for news and updates!\0"
             VALUE "CompanyName", "Sonic Team Junior\0"
-            VALUE "FileDescription", "Sonic Robo Blast 2\0"
+            VALUE "FileDescription", "Kitchen Sink Faucet\0"
             VALUE "FileVersion", VERSIONSTRING_RC
             VALUE "InternalName", "srb2\0"
             VALUE "LegalCopyright", "Copyright 1998-2020 by Sonic Team Junior\0"
             VALUE "LegalTrademarks", "Sonic the Hedgehog and related characters are trademarks of Sega.\0"
-            VALUE "OriginalFilename", "srb2win.exe\0"
+            VALUE "OriginalFilename", "kitchensinkfaucet.exe\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Sonic Robo Blast 2\0"
+            VALUE "ProductName", "Kitchen Sink Faucet\0"
             VALUE "ProductVersion", VERSIONSTRING_RC
             VALUE "SpecialBuild", "\0"
         END

From 70ebca2bf602dd69beb1a4c00a9aafe96b8722e0 Mon Sep 17 00:00:00 2001
From: Jaime Ita Passos <jp6781615@gmail.com>
Date: Thu, 25 Feb 2021 00:25:09 -0300
Subject: [PATCH 6/9] Update README

---
 README.md | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 8a5ca1a1f..98cff8fec 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,7 @@
-# Sonic Robo Blast 2
+# Kitchen Sink Faucet SRB2
 
-[![Build status](https://ci.appveyor.com/api/projects/status/399d4hcw9yy7hg2y?svg=true)](https://ci.appveyor.com/project/STJr/srb2)
-[![Build status](https://travis-ci.org/STJr/SRB2.svg?branch=master)](https://travis-ci.org/STJr/SRB2)
-[![CircleCI](https://circleci.com/gh/STJr/SRB2/tree/master.svg?style=svg)](https://circleci.com/gh/STJr/SRB2/tree/master)
-
-[Sonic Robo Blast 2](https://srb2.org/) is a 3D Sonic the Hedgehog fangame based on a modified version of [Doom Legacy](http://doomlegacy.sourceforge.net/).
+[![Build status](https://ci.appveyor.com/api/projects/status/gv49pw5mra2sad1j?svg=true)](https://ci.appveyor.com/project/jimita/kitchensinkfaucetsrb2)
+[![CircleCI](https://circleci.com/gh/Jimita/KitchenSinkFaucetSRB2/tree/master.svg?style=svg)](https://app.circleci.com/pipelines/github/Jimita/KitchenSinkFaucetSRB2)
 
 ## Dependencies
 - NASM (x86 builds only)

From 2ca8efd7eea4b3d531ac5fca4ef09a5da9f2efd1 Mon Sep 17 00:00:00 2001
From: Jaime Ita Passos <jp6781615@gmail.com>
Date: Thu, 25 Feb 2021 20:17:27 -0300
Subject: [PATCH 7/9] Revert accidental push

---
 README.md              | 9 ++++++---
 src/d_netcmd.c         | 4 ++--
 src/m_misc.c           | 6 +++---
 src/sdl/i_system.c     | 8 ++++----
 src/sdl/i_video.c      | 2 +-
 src/win32/Makefile.cfg | 2 +-
 src/win32/Srb2win.rc   | 6 +++---
 7 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 98cff8fec..8a5ca1a1f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,10 @@
-# Kitchen Sink Faucet SRB2
+# Sonic Robo Blast 2
 
-[![Build status](https://ci.appveyor.com/api/projects/status/gv49pw5mra2sad1j?svg=true)](https://ci.appveyor.com/project/jimita/kitchensinkfaucetsrb2)
-[![CircleCI](https://circleci.com/gh/Jimita/KitchenSinkFaucetSRB2/tree/master.svg?style=svg)](https://app.circleci.com/pipelines/github/Jimita/KitchenSinkFaucetSRB2)
+[![Build status](https://ci.appveyor.com/api/projects/status/399d4hcw9yy7hg2y?svg=true)](https://ci.appveyor.com/project/STJr/srb2)
+[![Build status](https://travis-ci.org/STJr/SRB2.svg?branch=master)](https://travis-ci.org/STJr/SRB2)
+[![CircleCI](https://circleci.com/gh/STJr/SRB2/tree/master.svg?style=svg)](https://circleci.com/gh/STJr/SRB2/tree/master)
+
+[Sonic Robo Blast 2](https://srb2.org/) is a 3D Sonic the Hedgehog fangame based on a modified version of [Doom Legacy](http://doomlegacy.sourceforge.net/).
 
 ## Dependencies
 - NASM (x86 builds only)
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 8d42ca4c2..4208e4c4f 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -3477,9 +3477,9 @@ static void Command_ListWADS_f(void)
 static void Command_Version_f(void)
 {
 #ifdef DEVELOP
-	CONS_Printf("Kitchen Sink Faucet %s-%s (%s %s) ", compbranch, comprevision, compdate, comptime);
+	CONS_Printf("Sonic Robo Blast 2 %s-%s (%s %s) ", compbranch, comprevision, compdate, comptime);
 #else
-	CONS_Printf("Kitchen Sink Faucet %s (%s %s %s %s) ", VERSIONSTRING, compdate, comptime, comprevision, compbranch);
+	CONS_Printf("Sonic Robo Blast 2 %s (%s %s %s %s) ", VERSIONSTRING, compdate, comptime, comprevision, compbranch);
 #endif
 
 	// Base library
diff --git a/src/m_misc.c b/src/m_misc.c
index 376e7512f..42890cb08 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -783,10 +783,10 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png
 	char keytxt[SRB2PNGTXT][12] = {
 	"Title", "Description", "Playername", "Mapnum", "Mapname",
 	"Location", "Interface", "Render Mode", "Revision", "Build Date", "Build Time"};
-	char titletxt[] = "Kitchen Sink Faucet " VERSIONSTRING;
+	char titletxt[] = "Sonic Robo Blast 2 " VERSIONSTRING;
 	png_charp playertxt =  cv_playername.zstring;
-	char desctxt[] = "Kitchen Sink Faucet Screenshot";
-	char Movietxt[] = "Kitchen Sink Faucet Movie";
+	char desctxt[] = "SRB2 Screenshot";
+	char Movietxt[] = "SRB2 Movie";
 	size_t i;
 	char interfacetxt[] =
 #ifdef HAVE_SDL
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 1c47b89c9..10c0747bf 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -629,7 +629,7 @@ static void I_StartupConsole(void)
 
 	if (gotConsole)
 	{
-		SetConsoleTitleA("Kitchen Sink Faucet Console");
+		SetConsoleTitleA("SRB2 Console");
 		consolevent = SDL_TRUE;
 	}
 
@@ -1622,7 +1622,7 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
 		return;
 
 	if(mumble->uiVersion != 2) {
-		wcsncpy(mumble->name, L"Kitchen Sink Faucet "VERSIONSTRINGW, 256);
+		wcsncpy(mumble->name, L"SRB2 "VERSIONSTRINGW, 256);
 		wcsncpy(mumble->description, L"Sonic Robo Blast 2 with integrated Mumble Link support.", 2048);
 		mumble->uiVersion = 2;
 	}
@@ -2400,7 +2400,7 @@ void I_Error(const char *error, ...)
 			// which should fail gracefully if it can't put a message box up
 			// on the target system
 			SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
-				"Kitchen Sink Faucet Recursive Error",
+				"SRB2 "VERSIONSTRING" Recursive Error",
 				buffer, NULL);
 
 			W_Shutdown();
@@ -2444,7 +2444,7 @@ void I_Error(const char *error, ...)
 	// which should fail gracefully if it can't put a message box up
 	// on the target system
 	SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
-		"Kitchen Sink Faucet Error",
+		"SRB2 "VERSIONSTRING" Error",
 		buffer, NULL);
 	// Note that SDL_ShowSimpleMessageBox does *not* require SDL to be
 	// initialized at the time, so calling it after SDL_Quit() is
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 032521c0a..c8f67da77 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1631,7 +1631,7 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
 #endif
 
 	// Create a window
-	window = SDL_CreateWindow("Kitchen Sink Faucet "VERSIONSTRING, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+	window = SDL_CreateWindow("SRB2 "VERSIONSTRING, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
 			realwidth, realheight, flags);
 
 
diff --git a/src/win32/Makefile.cfg b/src/win32/Makefile.cfg
index 0365f617d..702ae3765 100644
--- a/src/win32/Makefile.cfg
+++ b/src/win32/Makefile.cfg
@@ -68,7 +68,7 @@ endif
 endif
 
 	# name of the exefile
-	EXENAME?=kitchensinkfaucet.exe
+	EXENAME?=srb2win.exe
 
 ifdef SDL
 	i_system_o+=$(OBJDIR)/SRB2.res
diff --git a/src/win32/Srb2win.rc b/src/win32/Srb2win.rc
index 98927e2a6..5ba366bda 100644
--- a/src/win32/Srb2win.rc
+++ b/src/win32/Srb2win.rc
@@ -84,14 +84,14 @@ BEGIN
         BEGIN
             VALUE "Comments", "Visit our web site at www.srb2.org for news and updates!\0"
             VALUE "CompanyName", "Sonic Team Junior\0"
-            VALUE "FileDescription", "Kitchen Sink Faucet\0"
+            VALUE "FileDescription", "Sonic Robo Blast 2\0"
             VALUE "FileVersion", VERSIONSTRING_RC
             VALUE "InternalName", "srb2\0"
             VALUE "LegalCopyright", "Copyright 1998-2020 by Sonic Team Junior\0"
             VALUE "LegalTrademarks", "Sonic the Hedgehog and related characters are trademarks of Sega.\0"
-            VALUE "OriginalFilename", "kitchensinkfaucet.exe\0"
+            VALUE "OriginalFilename", "srb2win.exe\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Kitchen Sink Faucet\0"
+            VALUE "ProductName", "Sonic Robo Blast 2\0"
             VALUE "ProductVersion", VERSIONSTRING_RC
             VALUE "SpecialBuild", "\0"
         END

From 6d539626c4f6cd2ba7434571daae3878788a50ac Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sun, 28 Feb 2021 16:12:38 -0800
Subject: [PATCH 8/9] I forgot to add the dep directory

---
 dep/.gitignore                     | 2 ++
 dep/FreeBSD/SDL/Debug/.gitignore   | 2 ++
 dep/FreeBSD/SDL/Release/.gitignore | 2 ++
 dep/Linux/SDL/Debug/.gitignore     | 2 ++
 dep/Linux/SDL/Release/.gitignore   | 2 ++
 dep/Linux64/SDL/Debug/.gitignore   | 2 ++
 dep/Linux64/SDL/Release/.gitignore | 2 ++
 dep/MasterClient/.gitignore        | 2 ++
 dep/MasterServer/.gitignore        | 2 ++
 dep/Mingw/Debug/.gitignore         | 2 ++
 dep/Mingw/Release/.gitignore       | 2 ++
 dep/Mingw/SDL/Debug/.gitignore     | 2 ++
 dep/Mingw/SDL/Release/.gitignore   | 2 ++
 dep/Mingw64/Debug/.gitignore       | 2 ++
 dep/Mingw64/Release/.gitignore     | 2 ++
 dep/Mingw64/SDL/Debug/.gitignore   | 2 ++
 dep/Mingw64/SDL/Release/.gitignore | 2 ++
 dep/SDL/Release/.gitignore         | 2 ++
 dep/VC/.gitignore                  | 2 ++
 dep/VC9/.gitignore                 | 2 ++
 dep/cygwin/Debug/.gitignore        | 2 ++
 dep/cygwin/Release/.gitignore      | 2 ++
 dep/dummy/.gitignore               | 2 ++
 23 files changed, 46 insertions(+)
 create mode 100644 dep/.gitignore
 create mode 100644 dep/FreeBSD/SDL/Debug/.gitignore
 create mode 100644 dep/FreeBSD/SDL/Release/.gitignore
 create mode 100644 dep/Linux/SDL/Debug/.gitignore
 create mode 100644 dep/Linux/SDL/Release/.gitignore
 create mode 100644 dep/Linux64/SDL/Debug/.gitignore
 create mode 100644 dep/Linux64/SDL/Release/.gitignore
 create mode 100644 dep/MasterClient/.gitignore
 create mode 100644 dep/MasterServer/.gitignore
 create mode 100644 dep/Mingw/Debug/.gitignore
 create mode 100644 dep/Mingw/Release/.gitignore
 create mode 100644 dep/Mingw/SDL/Debug/.gitignore
 create mode 100644 dep/Mingw/SDL/Release/.gitignore
 create mode 100644 dep/Mingw64/Debug/.gitignore
 create mode 100644 dep/Mingw64/Release/.gitignore
 create mode 100644 dep/Mingw64/SDL/Debug/.gitignore
 create mode 100644 dep/Mingw64/SDL/Release/.gitignore
 create mode 100644 dep/SDL/Release/.gitignore
 create mode 100644 dep/VC/.gitignore
 create mode 100644 dep/VC9/.gitignore
 create mode 100644 dep/cygwin/Debug/.gitignore
 create mode 100644 dep/cygwin/Release/.gitignore
 create mode 100644 dep/dummy/.gitignore

diff --git a/dep/.gitignore b/dep/.gitignore
new file mode 100644
index 000000000..fb941664f
--- /dev/null
+++ b/dep/.gitignore
@@ -0,0 +1,2 @@
+#All folders
+*.d
diff --git a/dep/FreeBSD/SDL/Debug/.gitignore b/dep/FreeBSD/SDL/Debug/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/FreeBSD/SDL/Debug/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/FreeBSD/SDL/Release/.gitignore b/dep/FreeBSD/SDL/Release/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/FreeBSD/SDL/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Linux/SDL/Debug/.gitignore b/dep/Linux/SDL/Debug/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/Linux/SDL/Debug/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Linux/SDL/Release/.gitignore b/dep/Linux/SDL/Release/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/Linux/SDL/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Linux64/SDL/Debug/.gitignore b/dep/Linux64/SDL/Debug/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/Linux64/SDL/Debug/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Linux64/SDL/Release/.gitignore b/dep/Linux64/SDL/Release/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/Linux64/SDL/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/MasterClient/.gitignore b/dep/MasterClient/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/MasterClient/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/MasterServer/.gitignore b/dep/MasterServer/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/MasterServer/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Mingw/Debug/.gitignore b/dep/Mingw/Debug/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/Mingw/Debug/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Mingw/Release/.gitignore b/dep/Mingw/Release/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/Mingw/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Mingw/SDL/Debug/.gitignore b/dep/Mingw/SDL/Debug/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/Mingw/SDL/Debug/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Mingw/SDL/Release/.gitignore b/dep/Mingw/SDL/Release/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/Mingw/SDL/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Mingw64/Debug/.gitignore b/dep/Mingw64/Debug/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/Mingw64/Debug/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Mingw64/Release/.gitignore b/dep/Mingw64/Release/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/Mingw64/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Mingw64/SDL/Debug/.gitignore b/dep/Mingw64/SDL/Debug/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/Mingw64/SDL/Debug/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Mingw64/SDL/Release/.gitignore b/dep/Mingw64/SDL/Release/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/Mingw64/SDL/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/SDL/Release/.gitignore b/dep/SDL/Release/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/SDL/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/VC/.gitignore b/dep/VC/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/VC/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/VC9/.gitignore b/dep/VC9/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/VC9/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/cygwin/Debug/.gitignore b/dep/cygwin/Debug/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/cygwin/Debug/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/cygwin/Release/.gitignore b/dep/cygwin/Release/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/cygwin/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/dummy/.gitignore b/dep/dummy/.gitignore
new file mode 100644
index 000000000..42c6dc2c6
--- /dev/null
+++ b/dep/dummy/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing

From 5f4e21ed3a97063c917d7f9ff406548b7e873ddd Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sun, 28 Feb 2021 17:02:08 -0800
Subject: [PATCH 9/9] Fix dependency file trying to be made for SRB2.res and
 not for interface/blua/hardware files

---
 src/Makefile | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 260175a69..471c55ed3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -554,7 +554,7 @@ OBJS:=$(i_main_o) \
 		$(i_sound_o)    \
 		$(OBJS)
 
-DEPS:=$(patsubst $(OBJDIR)/%.o,$(DEPDIR)/%.d,$(OBJS))
+DEPS:=$(patsubst $(OBJDIR)/%.o,$(DEPDIR)/%.d,$(filter %.o,$(OBJS)))
 OBJS+=$(OBJDIR)/comptime.o
 
 ifndef SILENT
@@ -688,14 +688,33 @@ $(call print,Checking dependency files...)
 endif
 endif
 
-$(DEPDIR)/%.d: %.c
+undefine deps_rule
+
 # windows makes it too hard !
 ifndef WINDOWSHELL
 ifdef echoName
+define deps_rule =
 	@printf "%-20.20s\r" $<
+
+endef
 endif
 endif
+
+define deps_rule +=
 	$(CC) $(CFLAGS) -M -MF $@ -MT $(OBJDIR)/$< $<
+endef
+
+$(DEPDIR)/%.d: %.c
+	$(deps_rule)
+
+$(DEPDIR)/%.d: $(INTERFACE)/%.c
+	$(deps_rule)
+
+$(DEPDIR)/%.d: hardware/%.c
+	$(deps_rule)
+
+$(DEPDIR)/%.d: blua/%.c
+	$(deps_rule)
 
 ifdef VALGRIND
 $(OBJDIR)/z_zone.o: z_zone.c