Updates to main Makefile (and added spinsult Makefile)

This commit is contained in:
Russ Magee 2018-07-04 23:07:09 -07:00
parent 9edcc5110c
commit 94e06abbcb
2 changed files with 38 additions and 10 deletions

View File

@ -1,9 +1,10 @@
.PHONY: info clean lib client server passwd .PHONY: info clean common client server passwd subpkgs
SUBDIRS = hkexnet herradurakex hkexpasswd hkexsh hkexshd SUBPKGS = spinsult hkexnet herradurakex
LIBS = hkexnet herradurakex TOOLS = hkexpasswd hkexsh hkexshd
SUBDIRS = $(LIBS) $(TOOLS)
all: lib client server passwd all: common client server passwd
clean: clean:
go clean . go clean .
@ -11,20 +12,30 @@ clean:
$(MAKE) -C $$d clean;\ $(MAKE) -C $$d clean;\
done done
lib: subpkgs:
for d in $(SUBPKGS); do\
$(MAKE) -C $$d all;\
done
tools:
for d in $(TOOLS); do\
$(MAKE) -C $$d all;\
done
common:
go install . go install .
client: lib client: common
$(MAKE) -C hkexsh $(MAKE) -C hkexsh
ifneq ($(MSYSTEM),) ifneq ($(MSYSTEM),)
server: lib server: common
echo "hkexshd server not supported on Windows (yet)" echo "hkexshd server not (yet) supported on Windows"
else else
server: lib server: common
$(MAKE) -C hkexshd $(MAKE) -C hkexshd
endif endif
passwd: lib passwd: common
$(MAKE) -C hkexpasswd $(MAKE) -C hkexpasswd

17
spinsult/Makefile Normal file
View File

@ -0,0 +1,17 @@
.PHONY: info clean lib
all: lib
clean:
go clean .
lib: info
go install .
ifneq ($(MSYSTEM),)
info:
@echo "Building for Windows (MSYS)"
else
info:
@echo "Building for Linux"
endif