Merge branch 'master' of github.com:jclehner/nmrp-flash

diff --cc Makefile
index 38da84a4534f7f1b76489399ce941131956d27c8,c3dcb29843d0ff902c740af1ddf0e62550d309cf..4fd44efff1aeadaa9448232ba507253b70f6e3e3
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,13 -1,12 +1,13 @@@
  CC ?= gcc
  PREFIX ?= /usr/local
- CFLAGS = -Wall -g
+ CFLAGS += -Wall -g
  LIBS = -lpcap
 +LDFLAGS = $(LIBS)
  
- .PHONY: clean install
+ .PHONY: clean install release release/osx release/linux
  
  nmrp-flash: nmrp.o tftp.o ethsock.o main.o
 -      $(CC) $(CFLAGS) -o nmrp-flash nmrp.o tftp.o ethsock.o main.o $(LIBS)
 +      $(CC) $(CFLAGS) -o nmrp-flash nmrp.o tftp.o ethsock.o main.o $(LDFLAGS)
  
  nmrp.o: nmrp.c nmrpd.h
        $(CC) $(CFLAGS) -c -o nmrp.o nmrp.c