From a262e006d17dba570681a18e506576a267d3571c Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaledhosny@eglug.org>
Date: Sat, 22 Nov 2014 16:40:37 +0200
Subject: [PATCH] Fold shared.mk into Makefile

There is only one Makefile in this repository.
---
 Makefile  | 15 +++++++++++++--
 shared.mk | 17 -----------------
 2 files changed, 13 insertions(+), 19 deletions(-)
 delete mode 100644 shared.mk

diff --git a/Makefile b/Makefile
index d343078..0bcf6b1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,17 @@
-#Converter makefile
+OS := $(shell uname)
 
-include shared.mk
+IDIRS=-I./brotli/dec/ -I./brotli/enc/ -I./src
+
+CPP = g++
+LFLAGS =
+GFLAGS=-no-canonical-prefixes -fno-omit-frame-pointer -m64
+CPPFLAGS = -c $(IDIRS) -std=c++0x $(GFLAGS)
+
+ifeq ($(OS), Darwin)
+  CPPFLAGS += -DOS_MACOSX
+else
+  CPPFLAGS += -fno-tree-vrp
+endif
 
 SRCDIR = src
 
diff --git a/shared.mk b/shared.mk
deleted file mode 100644
index 45ee7c4..0000000
--- a/shared.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-OS := $(shell uname)
-IDIRS=-I./brotli/dec/ -I./brotli/enc/ -I./src
-
-GFLAGS=-no-canonical-prefixes -fno-omit-frame-pointer -m64
-
-CPP = g++
-LFLAGS =
-CPPFLAGS = -c $(IDIRS) -std=c++0x $(GFLAGS)
-
-ifeq ($(OS), Darwin)
-  CPPFLAGS += -DOS_MACOSX
-else
-  CPPFLAGS += -fno-tree-vrp
-endif
-
-%.o : %.c
-	$(CPP) $(CPPFLAGS) $< -o $@