Merge pull request #234 from matrix/osx_makefiles

Fix compilation under MacOSX

client/Makefile

@@ -31,7 +31,12 @@ platform = $(shell uname)
 VPATH = ../common ../zlib ../uart
 OBJDIR = obj
 
-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
+LDLIBS =
+ifneq ($(platform),Darwin)
+    LDLIBS += -L/opt/local/lib
+endif
+LDLIBS += -L/usr/local/lib -lreadline -lpthread -lm
+
 # RPi Zero gcc requires -latomic
 # but MacOSX /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
 # doesn't recognize option --as-needed

client/jansson/Makefile

@@ -36,15 +36,26 @@ CFILES = $(filter %.c, $(libjansson_la_SOURCES))
 CMDOBJS = $(CFILES:%.c=%.o)
 CLEAN = $(CMDOBJS)
 
+platform = $(shell uname)
+
 CC= gcc
-CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function -Wno-format-truncation
+CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function
+ifneq ($(platform),Darwin)
+CFLAGS += -Wno-format-truncation
+endif
+
 LDFLAGS= $(SYSLDFLAGS) $(libjansson_la_LDFLAGS)
 LIBS= $(SYSLIBS) $(MYLIBS)
 DEFAULT_INCLUDES = -I.
 DEFS = -DHAVE_STDINT_H
 
+ifeq ($(platform),Darwin)
+AR= /usr/bin/ar rcs
+RANLIB= /usr/bin/ranlib
+else
 AR= ar rcs
 RANLIB= ranlib
+endif
 RM= rm -f
 TST= echo
 

client/tinycbor/Makefile

@@ -19,14 +19,21 @@ CFILES = $(filter %.c, $(tinycbor_SOURCES))
 CMDOBJS = $(CFILES:%.c=%.o)
 CLEAN = $(CMDOBJS)
 
+platform = $(shell uname)
+
 CC= gcc
 CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function
 LIBS=  $(SYSLIBS) $(MYLIBS)
 DEFAULT_INCLUDES = -I. -I..
 DEFS = -DHAVE_STDINT_H
 
+ifeq ($(platform),Darwin)
+AR= /usr/bin/ar rcs
+RANLIB= /usr/bin/ranlib
+else
 AR= ar rcs
 RANLIB= ranlib
+endif
 RM= rm -f
 TST= echo