From: Joseph C. Lehner <joseph.c.lehner@gmail.com>
Date: Mon, 8 Feb 2016 14:26:38 +0000 (+0100)
Subject: Merge branch 'master' of github.com:jclehner/nmrp-flash
X-Git-Tag: v0.9~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6135b1be775acb3c38e6ccded0c7d6071eeeb3b2;p=oweals%2Fnmrpflash.git

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

6135b1be775acb3c38e6ccded0c7d6071eeeb3b2
diff --cc Makefile
index 38da84a,c3dcb29..4fd44ef
--- a/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