From 2afcc9c76e823834000e873ce78249fff2b41644 Mon Sep 17 00:00:00 2001
From: Pieter Noordhuis <pcnoordhuis@gmail.com>
Date: Fri, 8 Jun 2012 16:28:54 -0700
Subject: [PATCH] Move common Makefile variables to separate file

---
 src/Makefile        | 39 +--------------------------------------
 src/Makefile.common | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 38 deletions(-)
 create mode 100644 src/Makefile.common

diff --git a/src/Makefile b/src/Makefile
index 24aa026..04f1e28 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,44 +3,7 @@
 # Copyright (C) 2010-2011 Pieter Noordhuis <pcnoordhuis at gmail dot com>
 # This file is released under the BSD license, see the COPYING file
 
-LIBNAME= libhiredis
-HIREDIS_MAJOR= 0
-HIREDIS_MINOR= 11
-
-DYLIBSUFFIX= so
-STLIBSUFFIX= a
-DYLIB_MINOR_NAME= $(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR).$(HIREDIS_MINOR)
-DYLIB_MAJOR_NAME= $(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR)
-DYLIBNAME= $(LIBNAME).$(DYLIBSUFFIX)
-DYLIB_MAKE_CMD= $(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(FINAL_LDFLAGS)
-STLIBNAME= $(LIBNAME).$(STLIBSUFFIX)
-STLIB_MAKE_CMD= ar rcs $(STLIBNAME)
-
-# Default settings
-STD= -std=c99 -pedantic
-WARN= -Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-unused-label
-OPT= -O3
-FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) -fPIC $(CFLAGS) $(HIREDIS_CFLAGS)
-FINAL_LDFLAGS= $(DEBUG) $(LDFLAGS) $(HIREDIS_LDFLAGS)
-DEBUG= -g -ggdb
-
-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
-
-# SunOS overrides
-ifeq ($(uname_S),SunOS)
-  HIREDIS_CFLAGS= -D__EXTENSIONS__ -D_XPG6
-  HIREDIS_LDFLAGS= -ldl -lnsl -lsocket
-  DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
-  INSTALL= cp -r
-endif
-
-# Darwin overrides
-ifeq ($(uname_S),Darwin)
-  DYLIBSUFFIX= dylib
-  DYLIB_MINOR_NAME= $(LIBNAME).$(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(DYLIBSUFFIX)
-  DYLIB_MAJOR_NAME= $(LIBNAME).$(HIREDIS_MAJOR).$(DYLIBSUFFIX)
-  DYLIB_MAKE_CMD= $(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(FINAL_LDFLAGS)
-endif
+include ./Makefile.common
 
 OBJ= \
 		address.o \
diff --git a/src/Makefile.common b/src/Makefile.common
new file mode 100644
index 0000000..b8088b3
--- /dev/null
+++ b/src/Makefile.common
@@ -0,0 +1,38 @@
+LIBNAME= libhiredis
+HIREDIS_MAJOR= 0
+HIREDIS_MINOR= 11
+
+DYLIBSUFFIX= so
+STLIBSUFFIX= a
+DYLIB_MINOR_NAME= $(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR).$(HIREDIS_MINOR)
+DYLIB_MAJOR_NAME= $(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR)
+DYLIBNAME= $(LIBNAME).$(DYLIBSUFFIX)
+DYLIB_MAKE_CMD= $(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(FINAL_LDFLAGS)
+STLIBNAME= $(LIBNAME).$(STLIBSUFFIX)
+STLIB_MAKE_CMD= ar rcs $(STLIBNAME)
+
+# Default settings
+STD= -std=c99 -pedantic
+WARN= -Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-unused-label
+OPT= -O3
+FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) -fPIC $(CFLAGS) $(HIREDIS_CFLAGS)
+FINAL_LDFLAGS= $(DEBUG) $(LDFLAGS) $(HIREDIS_LDFLAGS)
+DEBUG= -g -ggdb
+
+uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+
+# SunOS overrides
+ifeq ($(uname_S),SunOS)
+  HIREDIS_CFLAGS= -D__EXTENSIONS__ -D_XPG6
+  HIREDIS_LDFLAGS= -ldl -lnsl -lsocket
+  DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
+  INSTALL= cp -r
+endif
+
+# Darwin overrides
+ifeq ($(uname_S),Darwin)
+  DYLIBSUFFIX= dylib
+  DYLIB_MINOR_NAME= $(LIBNAME).$(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(DYLIBSUFFIX)
+  DYLIB_MAJOR_NAME= $(LIBNAME).$(HIREDIS_MAJOR).$(DYLIBSUFFIX)
+  DYLIB_MAKE_CMD= $(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(FINAL_LDFLAGS)
+endif