From 7bebf23b6be952edf8ef13e4802f87004792116a Mon Sep 17 00:00:00 2001 From: John Tsiombikas Date: Tue, 18 May 2021 01:29:17 +0300 Subject: [PATCH] Apparently DJGPP make also tries to use GNUMAKEF preferentially if it can find it, so there's no point in calling the UNIX makefile GNUmakefile. Revert it to Makefile and we'll just use make -f makefile.dj for dos. --- GNUmakefile | 32 -------------------------------- Makefile | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 GNUmakefile create mode 100644 Makefile diff --git a/GNUmakefile b/GNUmakefile deleted file mode 100644 index 4c1087e..0000000 --- a/GNUmakefile +++ /dev/null @@ -1,32 +0,0 @@ -src = $(wildcard src/*.c) $(wildcard src/x11/*.c) -ssrc = sinlut.s -obj = $(src:.c=.o) $(ssrc:.s=.o) -dep = $(src:.c=.d) -bin = rbench - -warn = -pedantic -Wall -Wno-deprecated-declarations -dbg = -g -opt = -O3 -ffast-math -inc = -Isrc - -CFLAGS = -pedantic $(warn) $(dbg) $(opt) $(inc) -MMD -LDFLAGS = -L/usr/X11R6/lib -lX11 -lXext -lm - -$(bin): $(obj) - $(CC) -o $@ $(obj) $(LDFLAGS) - -sinlut.s: tools/lutgen - tools/lutgen >$@ - --include $(dep) - -.PHONY: clean -clean: - $(RM) $(obj) $(bin) - -.PHONY: cleandep -cleandep: - $(RM) $(dep) - -tools/lutgen: tools/lutgen.c - $(CC) -o $@ $< -lm diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..4c1087e --- /dev/null +++ b/Makefile @@ -0,0 +1,32 @@ +src = $(wildcard src/*.c) $(wildcard src/x11/*.c) +ssrc = sinlut.s +obj = $(src:.c=.o) $(ssrc:.s=.o) +dep = $(src:.c=.d) +bin = rbench + +warn = -pedantic -Wall -Wno-deprecated-declarations +dbg = -g +opt = -O3 -ffast-math +inc = -Isrc + +CFLAGS = -pedantic $(warn) $(dbg) $(opt) $(inc) -MMD +LDFLAGS = -L/usr/X11R6/lib -lX11 -lXext -lm + +$(bin): $(obj) + $(CC) -o $@ $(obj) $(LDFLAGS) + +sinlut.s: tools/lutgen + tools/lutgen >$@ + +-include $(dep) + +.PHONY: clean +clean: + $(RM) $(obj) $(bin) + +.PHONY: cleandep +cleandep: + $(RM) $(dep) + +tools/lutgen: tools/lutgen.c + $(CC) -o $@ $< -lm -- 1.7.10.4