From ad187b4bf3877feae9249e5627705d010bbed6aa Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Mon, 26 Dec 2016 11:14:38 -0500 Subject: [PATCH] clean up makefile a little bit. --- Makefile | 20 +++++++++++--------- err.c => mingw/err.c | 0 err.h => mingw/err.h | 0 sysexits.h => mingw/sysexits.h | 0 4 files changed, 11 insertions(+), 9 deletions(-) rename err.c => mingw/err.c (100%) rename err.h => mingw/err.h (100%) rename sysexits.h => mingw/sysexits.h (100%) diff --git a/Makefile b/Makefile index f8a9da8..6fb92c7 100644 --- a/Makefile +++ b/Makefile @@ -1,28 +1,30 @@ LINK.o = $(LINK.cc) CXXFLAGS = -std=c++11 -g CCFLAGS = -g -CPPFLAGS = -I . -UNAME_S := $(shell uname -s) OBJS = dumpobj.o disassembler.o +#UNAME_S := $(shell uname -s) #ifeq ($(UNAME_S),MINGW64_NT-10.0) ifeq ($(MSYSTEM),MINGW64) - OBJS += err.o + OBJS += mingw/err.o + CPPFLAGS += -I mingw/ endif -.PHONY: variables -variables : - $(foreach v, $(.VARIABLES), $(info $(v) = $($(v)))) - @echo dumpobj : $(OBJS) disassembler.o : disassembler.cpp disassembler.h dumpobj.o : dumpobj.cpp disassembler.h -err.o : err.c err.h +mingw/err.o : mingw/err.c mingw/err.h .PHONY: clean clean: - $(RM) dumpobj $(OBJS) \ No newline at end of file + $(RM) dumpobj $(OBJS) + + +.PHONY: variables +variables : + $(foreach v, $(.VARIABLES), $(info $(v) = $($(v)))) + @echo diff --git a/err.c b/mingw/err.c similarity index 100% rename from err.c rename to mingw/err.c diff --git a/err.h b/mingw/err.h similarity index 100% rename from err.h rename to mingw/err.h diff --git a/sysexits.h b/mingw/sysexits.h similarity index 100% rename from sysexits.h rename to mingw/sysexits.h