From 3d4c7952e336fb4c7a914c861f12c15e64f9ec1e Mon Sep 17 00:00:00 2001
From: John Tsiombikas <nuclear@member.fsf.org>
Date: Thu, 8 Feb 2018 09:46:37 +0200
Subject: [PATCH] changed the DJGPP makefiles to use different suffixes for
 intermediate build files (.cof instead of .o, .dep instead
 of .d, and .dja instead of .a), to make it possible to
 build both the linux and the dos version in the same
 directory without conflict.

---
 .gitignore              |    9 +++++++--
 Makefile.dj             |   21 ++++++++++++---------
 libs/imago/Makefile.dj  |   15 +++++++++------
 libs/oldmik/Makefile.dj |    9 ++++++---
 4 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 09296a3..33467bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,5 +31,10 @@ data
 *.CFG
 *.cfg
 *.$$$
-
-/dosdemo.vcxproj.user
+/dosdemo.vcxproj.user
+*.dep
+*.DEP
+*.cof
+*.COF
+*.dja
+*.DJA
diff --git a/Makefile.dj b/Makefile.dj
index ed1a830..4b3f7a7 100644
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -1,6 +1,6 @@
 src = $(wildcard src/*.c) $(wildcard src/dos/*.c)
-obj = $(src:.c=.o)
-dep = $(obj:.o=.d)
+obj = $(src:.c=.cof)
+dep = $(obj:.cof=.dep)
 bin = demo.exe
 
 ifeq ($(findstring COMMAND.COM, $(SHELL)), COMMAND.COM)
@@ -17,15 +17,18 @@ dbg = -g
 CC = $(TOOLPREFIX)gcc
 AR = $(TOOLPREFIX)ar
 CFLAGS = -pedantic -Wall -march=pentium $(dbg) $(opt) $(inc)
-LDFLAGS = libs/imago/imago.a libs/oldmik/mikmod.a
+LDFLAGS = libs/imago/imago.dja libs/oldmik/mikmod.dja
 
 $(bin): $(obj) imago mikmod
 	$(CC) -o $@ -Wl,-Map=ld.map $(obj) $(LDFLAGS)
 
 -include $(dep)
 
-%.d: %.c
-	@$(CPP) $(CFLAGS) $< -MM -MT $(@:.d=.o) >$@
+%.cof: %.c
+	$(CC) $(CFLAGS) -o $@ -c $<
+
+%.dep: %.c
+	@$(CPP) $(CFLAGS) $< -MM -MT $(@:.dep=.cof) >$@
 
 .PHONY: imago
 imago:
@@ -45,13 +48,13 @@ cleanlibs:
 
 ifeq ($(hostsys), dos)
 clean:
-	del src\*.o
-	del src\dos\*.o
+	del src\*.cof
+	del src\dos\*.cof
 	del $(bin)
 
 cleandep:
-	del src\*.d
-	del src\dos\*.d
+	del src\*.dep
+	del src\dos\*.dep
 else
 clean:
 	rm -f $(obj) $(bin)
diff --git a/libs/imago/Makefile.dj b/libs/imago/Makefile.dj
index 5e15016..1f22386 100644
--- a/libs/imago/Makefile.dj
+++ b/libs/imago/Makefile.dj
@@ -2,8 +2,8 @@ src = $(wildcard src/*.c) \
 	  $(wildcard zlib/*.c) \
 	  $(wildcard libpng/*.c) \
 	  $(wildcard jpeglib/*.c)
-obj = $(src:.c=.o)
-alib = imago.a
+obj = $(src:.c=.cof)
+alib = imago.dja
 
 ifeq ($(findstring COMMAND.COM, $(SHELL)), COMMAND.COM)
 	hostsys = dos
@@ -19,13 +19,16 @@ CFLAGS = -pedantic -Wall -Wno-main -march=pentium -g -O3 -ffast-math -Izlib -Ili
 $(alib): $(obj)
 	$(AR) rcs $@ $(obj)
 
+%.cof: %.c
+	$(CC) $(CFLAGS) -o $@ -c $<
+
 .PHONY: clean
 ifeq ($(hostsys), dos)
 clean:
-	del src\*.o
-	del zlib\*.o
-	del libpng\*.o
-	del jpeglib\*.o
+	del src\*.cof
+	del zlib\*.cof
+	del libpng\*.cof
+	del jpeglib\*.cof
 	del $(alib)
 else
 clean:
diff --git a/libs/oldmik/Makefile.dj b/libs/oldmik/Makefile.dj
index 8162cc4..e971ead 100644
--- a/libs/oldmik/Makefile.dj
+++ b/libs/oldmik/Makefile.dj
@@ -1,7 +1,7 @@
 csrc = $(wildcard src/*.c)
-obj = $(csrc:.c=.o)
+obj = $(csrc:.c=.cof)
 
-alib = mikmod.a
+alib = mikmod.dja
 
 opt = -O3 -ffast-math
 #dbg = -g
@@ -20,10 +20,13 @@ CFLAGS = -march=pentium $(opt) $(dbg) -Isrc
 $(alib): $(obj)
 	$(AR) rcs $@ $(obj)
 
+%.cof: %.c
+	$(CC) $(CFLAGS) -o $@ -c $<
+
 .PHONY: clean
 ifeq ($(hostsys), dos)
 clean:
-	del src\*.o
+	del src\*.cof
 	del $(alib)
 else
 clean:
-- 
1.7.10.4