From 9959b123d24746017a78edaca2f401c30d6762ac Mon Sep 17 00:00:00 2001
From: David Betz <dbetz@xlisper.com>
Date: Mon, 26 Jan 2015 23:06:40 -0500
Subject: [PATCH] Cleanup the Makefile.

---
 Makefile  | 164 +++++++++++++++++++++++++++---------------------------
 ploader.c |   2 +-
 2 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/Makefile b/Makefile
index 205f0e9..8e8f461 100644
--- a/Makefile
+++ b/Makefile
@@ -1,82 +1,82 @@
-MKDIR=mkdir -p
-RM=rm
-CC=cc
-ECHO=echo
-
-OBJS=\
-$(OBJDIR)/p1load.o \
-$(OBJDIR)/ploader.o
-
-OS?=macosx
-
-ifeq ($(OS),linux)
-CFLAGS+=-DLINUX
-EXT=
-OSINT=osint_linux
-LIBS=
-endif
-
-ifeq ($(OS),raspberrypi)
-OS=linux
-CFLAGS+=-DLINUX -DRASPBERRY_PI
-EXT=
-OSINT=osint_linux
-LIBS=
-OBJS+=$(OBJDIR)/gpio_sysfs.o
-endif
-
-ifeq ($(OS),msys)
-CFLAGS += -DMINGW
-EXT=.exe
-OSINT=osint_mingw enumcom
-LIBS=-lsetupapi
-endif
-
-ifeq ($(OS),macosx)
-CFLAGS+=-DMACOSX
-EXT=
-OSINT=osint_linux
-LIBS=
-endif
-
-ifeq ($(OS),)
-$(error OS not set)
-endif
-
-SRCDIR=.
-OBJDIR=obj/$(OS)
-BINDIR=bin/$(OS)
-
-TARGET=$(BINDIR)/p1load$(EXT)
-
-HDRS=\
-ploader.h
-
-OBJS+=$(foreach x, $(OSINT), $(OBJDIR)/$(x).o)
-
-CFLAGS+=-Wall -DOS_$(OS)
-LDFLAGS=$(CFLAGS)
-
-.PHONY:	default
-default:	$(TARGET)
-
-DIRS=$(OBJDIR) $(BINDIR)
-
-$(TARGET):	$(BINDIR) $(OBJDIR) $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-$(OBJDIR)/%.o:	$(SRCDIR)/%.c $(HDRS) $(OBJDIR)
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(DIRS):
-	$(MKDIR) $@
-
-.PHONY:	clean
-clean:
-	$(RM) -f -r $(OBJDIR)
-	$(RM) -f -r $(BINDIR)
-
-.PHONY:	clean-all
-clean-all:
-	$(RM) -f -r obj
-	$(RM) -f -r bin
+MKDIR=mkdir -p
+RM=rm
+CC=cc
+ECHO=echo
+
+OBJS=\
+$(OBJDIR)/p1load.o \
+$(OBJDIR)/ploader.o
+
+OS?=macosx
+
+ifeq ($(OS),linux)
+CFLAGS+=-DLINUX
+EXT=
+OSINT=osint_linux
+LIBS=
+endif
+
+ifeq ($(OS),raspberrypi)
+OS=linux
+CFLAGS+=-DLINUX -DRASPBERRY_PI
+EXT=
+OSINT=osint_linux
+LIBS=
+OBJS+=$(OBJDIR)/gpio_sysfs.o
+endif
+
+ifeq ($(OS),msys)
+CFLAGS+=MINGW
+EXT=.exe
+OSINT=osint_mingw enumcom
+LIBS=-lsetupapi
+endif
+
+ifeq ($(OS),macosx)
+CFLAGS+=-DMACOSX
+EXT=
+OSINT=osint_linux
+LIBS=
+endif
+
+ifeq ($(OS),)
+$(error OS not set)
+endif
+
+SRCDIR=.
+OBJDIR=obj/$(OS)
+BINDIR=bin/$(OS)
+
+TARGET=$(BINDIR)/p1load$(EXT)
+
+HDRS=\
+ploader.h
+
+OBJS+=$(foreach x, $(OSINT), $(OBJDIR)/$(x).o)
+
+CFLAGS+=-Wall
+LDFLAGS=$(CFLAGS)
+
+.PHONY:	default
+default:	$(TARGET)
+
+DIRS=$(OBJDIR) $(BINDIR)
+
+$(TARGET):	$(BINDIR) $(OBJDIR) $(OBJS)
+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+
+$(OBJDIR)/%.o:	$(SRCDIR)/%.c $(HDRS) $(OBJDIR)
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(DIRS):
+	$(MKDIR) $@
+
+.PHONY:	clean
+clean:
+	$(RM) -f -r $(OBJDIR)
+	$(RM) -f -r $(BINDIR)
+
+.PHONY:	clean-all
+clean-all:
+	$(RM) -f -r obj
+	$(RM) -f -r bin
diff --git a/ploader.c b/ploader.c
index b96c180..19f3662 100644
--- a/ploader.c
+++ b/ploader.c
@@ -1,4 +1,4 @@
-#ifdef OS_msys
+#ifdef MINGW
 #include <unistd.h>
 #else
 #include <time.h>