Bump version

[oweals/nmrpflash.git] / Makefile

diff --git a/Makefile b/Makefile
index cb2be3250b9f65ae3dd4608c0d399dc25dadcb2c..175ff0689dbcfa0f8e126a852787d7cd75e7f219 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,39 @@
 CC ?= gcc
 PREFIX ?= /usr/local
-CFLAGS += -Wall -g -DNMRPFLASH_VERSION=\"$(shell git describe --always)\"
+VERSION = $(shell git describe --always | tail -c +2)
 LIBS = -lpcap
+CFLAGS += -Wall -g -DNMRPFLASH_VERSION=\"$(VERSION)\"
+LDFLAGS += $(LIBS)
 
-.PHONY: clean install release release/osx release/linux
+nmrpflash_OBJ = nmrp.o tftp.o ethsock.o main.o util.o
 
-nmrpflash: nmrp.o tftp.o ethsock.o main.o
-       $(CC) $(CFLAGS) -o nmrpflash nmrp.o tftp.o ethsock.o main.o $(LIBS)
+.PHONY: clean install release release/osx release/linux release/win32
 
-nmrp.o: nmrp.c nmrpd.h
-       $(CC) $(CFLAGS) -c -o nmrp.o nmrp.c
+nmrpflash: $(nmrpflash_OBJ)
+       $(CC) $(CFLAGS) -o nmrpflash $(nmrpflash_OBJ) $(LDFLAGS)
 
-tftp.o: tftp.c nmrpd.h
-       $(CC) $(CFLAGS) -c -o tftp.o tftp.c
+%.o: %.c nmrpd.h
+       $(CC) -c $(CFLAGS) $< -o $@
 
-ethsock.o: ethsock.c nmrpd.h
-       $(CC) $(CFLAGS) -c -o ethsock.o ethsock.c
-
-main.o: main.c nmrpd.h
-       $(CC) $(CFLAGS) -c -o main.o main.c
+fuzz: clean
+       CC=afl-gcc CFLAGS=-DNMRPFLASH_FUZZ make nmrpflash
+       mv nmrpflash fuzz
 
 clean:
-       rm -f nmrp.o tftp.o main.o ethsock.o nmrpflash nmrpflash.exe
+       rm -f nmrp.o tftp.o main.o ethsock.o nmrpflash
 
 install: nmrpflash
        install -m 755 nmrpflash $(PREFIX)/bin
 
 release/osx:
-       CFLAGS="-arch i686 -arch x86_64" make release
+       CFLAGS="-arch i386 -arch x86_64 -mmacosx-version-min=10.6" make release
+       zip nmrpflash-$(VERSION)-osx.zip nmrpflash
 
 release/linux: release
-       cp nmrpflash binaries/linux/
+       zip nmrpflash-$(VERSION)-linux.zip nmrpflash
+
+release/win32:
+       zip nmrpflash-$(VERSION)-win32.zip nmrpflash.exe
 
 release: clean nmrpflash
        strip nmrpflash