From 4f16ef5707daf4acd74a07b665d1d67ab97c1f44 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 28 Aug 2015 20:36:44 -0600 Subject: tidy Makefiles --- Makefile | 5 +++-- src/nslcd_proto/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 41ea59f..0ccd82e 100644 --- a/Makefile +++ b/Makefile @@ -6,10 +6,11 @@ systemddir = $(libdir)/systemd GOPATH := $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) deps = golang.org/x/exp/inotify gopkg.in/yaml.v2 +subdirs = src/nslcd_proto all: build -include src/nslcd_proto/Makefile +include $(addsuffix /Makefile,$(subdirs)) secondary += download += $(addprefix src/,$(deps)) @@ -25,7 +26,7 @@ install: $(install) clean: rm -rf -- pkg bin src/*.*/ - rm -f -- $(generate) $(build) $(decondary) + rm -f -- $(generate) $(build) $(secondary) .PHONY: clean uninstall: diff --git a/src/nslcd_proto/Makefile b/src/nslcd_proto/Makefile index 53b4424..f45360b 100644 --- a/src/nslcd_proto/Makefile +++ b/src/nslcd_proto/Makefile @@ -1,8 +1,8 @@ _ := $(MAKEFILE_LIST) d := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST)))) -generate := $d/interface_backend.go $d/func_handlerequest.go $d/struct_null_backend.go -secondary := $d/enumerator-list.mk $d/requests.txt $d/responses.txt $d/enumerator@*.go +generate := $(generate) $d/interface_backend.go $d/func_handlerequest.go $d/struct_null_backend.go +secondary := $(secondary) $d/enumerator-list.mk $d/requests.txt $d/responses.txt $d/enumerator@*.go ifeq (,$(filter clean,$(MAKECMDGOALS))) -include $d/enumerator-list.mk -- cgit v1.2.3-54-g00ecf