Revert multiple source change commits for rebase.

11 files changed, 23 insertions, 89 deletions

diff --git a/tools/aif2pcm/Makefile b/tools/aif2pcm/Makefile
index dd48a8759..77df29152 100644
--- a/tools/aif2pcm/Makefile
+++ b/tools/aif2pcm/Makefile
@@ -6,18 +6,12 @@ LIBS = -lm
 
 SRCS = main.c extended.c
 
-ifeq ($(OS),Windows_NT)
-EXE := .exe
-else
-EXE :=
-endif
-
 .PHONY: all clean
 
-all: aif2pcm$(EXE)
+all: aif2pcm
 	@:
 
-aif2pcm$(EXE): $(SRCS)
+aif2pcm: $(SRCS)
 	$(CC) $(CFLAGS) $(SRCS) -o $@ $(LDFLAGS) $(LIBS)
 
 clean:
diff --git a/tools/bin2c/Makefile b/tools/bin2c/Makefile
index 4dbfab94f..52806e39c 100644
--- a/tools/bin2c/Makefile
+++ b/tools/bin2c/Makefile
@@ -6,16 +6,10 @@ CFLAGS = -Wall -Wextra -Werror -std=c11 -O2
 
 SRCS = bin2c.c
 
-ifeq ($(OS),Windows_NT)
-EXE := .exe
-else
-EXE :=
-endif
-
-all: bin2c$(EXE)
+all: bin2c
 	@:
 
-bin2c$(EXE): $(SRCS)
+bin2c: $(SRCS)
 	$(CC) $(CFLAGS) $(SRCS) -o $@ $(LDFLAGS)
 
 clean:
diff --git a/tools/gbafix/Makefile b/tools/gbafix/Makefile
index efb016c97..91a60a9e4 100644
--- a/tools/gbafix/Makefile
+++ b/tools/gbafix/Makefile
@@ -3,16 +3,10 @@ CC ?= gcc
 
 SRCS = gbafix.c
 
-ifeq ($(OS),Windows_NT)
-EXE := .exe
-else
-EXE :=
-endif
-
-all: gbafix$(EXE)
+all: gbafix
 	@:
 
-gbafix$(EXE): $(SRCS)
+gbafix: $(SRCS)
 	$(CC) $(SRCS) -o $@ $(LDFLAGS)
 
 clean:
diff --git a/tools/gbagfx/Makefile b/tools/gbagfx/Makefile
index b4244aa8d..f0638414d 100644
--- a/tools/gbagfx/Makefile
+++ b/tools/gbagfx/Makefile
@@ -6,21 +6,15 @@ LIBS = -lpng -lz
 
 SRCS = main.c convert_png.c gfx.c jasc_pal.c lz.c rl.c util.c font.c huff.c
 
-ifeq ($(OS),Windows_NT)
-EXE := .exe
-else
-EXE :=
-endif
-
 .PHONY: all clean
 
-all: gbagfx$(EXE)
+all: gbagfx
 	@:
 
-gbagfx-debug$(EXE): $(SRCS) convert_png.h gfx.h global.h jasc_pal.h lz.h rl.h util.h font.h
+gbagfx-debug: $(SRCS) convert_png.h gfx.h global.h jasc_pal.h lz.h rl.h util.h font.h
 	$(CC) $(CFLAGS) -DDEBUG $(SRCS) -o $@ $(LDFLAGS) $(LIBS)
 
-gbagfx$(EXE): $(SRCS) convert_png.h gfx.h global.h jasc_pal.h lz.h rl.h util.h font.h
+gbagfx: $(SRCS) convert_png.h gfx.h global.h jasc_pal.h lz.h rl.h util.h font.h
 	$(CC) $(CFLAGS) $(SRCS) -o $@ $(LDFLAGS) $(LIBS)
 
 clean:
diff --git a/tools/jsonproc/Makefile b/tools/jsonproc/Makefile
index eec73eb7b..47198b171 100755
--- a/tools/jsonproc/Makefile
+++ b/tools/jsonproc/Makefile
@@ -8,18 +8,12 @@ SRCS := jsonproc.cpp
 
 HEADERS := jsonproc.h inja.hpp nlohmann/json.hpp
 
-ifeq ($(OS),Windows_NT)
-EXE := .exe
-else
-EXE :=
-endif
-
 .PHONY: all clean
 
-all: jsonproc$(EXE)
+all: jsonproc
 	@:
 
-jsonproc$(EXE): $(SRCS) $(HEADERS)
+jsonproc: $(SRCS) $(HEADERS)
 	$(CXX) $(CXXFLAGS) $(INCLUDES) $(SRCS) -o $@ $(LDFLAGS)
 
 clean:
diff --git a/tools/mapjson/Makefile b/tools/mapjson/Makefile
index 100e809c6..c1f703f9f 100644
--- a/tools/mapjson/Makefile
+++ b/tools/mapjson/Makefile
@@ -6,18 +6,12 @@ SRCS := json11.cpp mapjson.cpp
 
 HEADERS := mapjson.h
 
-ifeq ($(OS),Windows_NT)
-EXE := .exe
-else
-EXE :=
-endif
-
 .PHONY: all clean
 
-all: mapjson$(EXE)
+all: mapjson
 	@:
 
-mapjson$(EXE): $(SRCS) $(HEADERS)
+mapjson: $(SRCS) $(HEADERS)
 	$(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS)
 
 clean:
diff --git a/tools/mid2agb/Makefile b/tools/mid2agb/Makefile
index 553b7859e..451d4b39f 100644
--- a/tools/mid2agb/Makefile
+++ b/tools/mid2agb/Makefile
@@ -6,18 +6,12 @@ SRCS := agb.cpp error.cpp main.cpp midi.cpp tables.cpp
 
 HEADERS := agb.h error.h main.h midi.h tables.h
 
-ifeq ($(OS),Windows_NT)
-EXE := .exe
-else
-EXE :=
-endif
-
 .PHONY: all clean
 
-all: mid2agb$(EXE)
+all: mid2agb
 	@:
 
-mid2agb$(EXE): $(SRCS) $(HEADERS)
+mid2agb: $(SRCS) $(HEADERS)
 	$(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS)
 
 clean:
diff --git a/tools/preproc/Makefile b/tools/preproc/Makefile
index 1507c973f..8c48afea2 100644
--- a/tools/preproc/Makefile
+++ b/tools/preproc/Makefile
@@ -8,18 +8,12 @@ SRCS := asm_file.cpp c_file.cpp charmap.cpp preproc.cpp string_parser.cpp \
 HEADERS := asm_file.h c_file.h char_util.h charmap.h preproc.h string_parser.h \
 	utf8.h
 
-ifeq ($(OS),Windows_NT)
-EXE := .exe
-else
-EXE :=
-endif
-
 .PHONY: all clean
 
-all: preproc$(EXE)
+all: preproc
 	@:
 
-preproc$(EXE): $(SRCS) $(HEADERS)
+preproc: $(SRCS) $(HEADERS)
 	$(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS)
 
 clean:
diff --git a/tools/ramscrgen/Makefile b/tools/ramscrgen/Makefile
index a9375c87a..4e901a29c 100644
--- a/tools/ramscrgen/Makefile
+++ b/tools/ramscrgen/Makefile
@@ -8,16 +8,10 @@ HEADERS := ramscrgen.h sym_file.h elf.h char_util.h
 
 .PHONY: all clean
 
-ifeq ($(OS),Windows_NT)
-EXE := .exe
-else
-EXE :=
-endif
-
-all: ramscrgen$(EXE)
+all: ramscrgen
 	@:
 
-ramscrgen$(EXE): $(SRCS) $(HEADERS)
+ramscrgen: $(SRCS) $(HEADERS)
 	$(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS)
 
 clean:
diff --git a/tools/rsfont/Makefile b/tools/rsfont/Makefile
index 0bc88a42b..930a92b36 100644
--- a/tools/rsfont/Makefile
+++ b/tools/rsfont/Makefile
@@ -8,16 +8,10 @@ SRCS = main.c convert_png.c util.c font.c
 
 .PHONY: all clean
 
-ifeq ($(OS),Windows_NT)
-EXE := .exe
-else
-EXE :=
-endif
-
-all: rsfont$(EXE)
+all: rsfont
 	@:
 
-rsfont$(EXE): $(SRCS) convert_png.h gfx.h global.h util.h font.h
+rsfont: $(SRCS) convert_png.h gfx.h global.h util.h font.h
 	$(CC) $(CFLAGS) $(SRCS) -o $@ $(LDFLAGS) $(LIBS)
 
 clean:
diff --git a/tools/scaninc/Makefile b/tools/scaninc/Makefile
index 96d92f706..52e663d8d 100644
--- a/tools/scaninc/Makefile
+++ b/tools/scaninc/Makefile
@@ -8,16 +8,10 @@ HEADERS := scaninc.h asm_file.h c_file.h source_file.h
 
 .PHONY: all clean
 
-ifeq ($(OS),Windows_NT)
-EXE := .exe
-else
-EXE :=
-endif
-
-all: scaninc$(EXE)
+all: scaninc
 	@:
 
-scaninc$(EXE): $(SRCS) $(HEADERS)
+scaninc: $(SRCS) $(HEADERS)
 	$(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS)
 
 clean: