From cbb267f60bb13baa1cac65517f60249b1b5bd436 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 8 Nov 2015 00:56:44 -0500
Subject: tidy Makefile

---
 proto/Makefile | 48 +++++++++++++-----------------------------------
 1 file changed, 13 insertions(+), 35 deletions(-)

(limited to 'proto/Makefile')

diff --git a/proto/Makefile b/proto/Makefile
index e4730d5..6c15198 100644
--- a/proto/Makefile
+++ b/proto/Makefile
@@ -15,45 +15,23 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
-d := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
+srcdir := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
 
-generate += $d/server/interface_backend.go
-generate += $d/server/func_handlerequest.go
-generate += $d/server/type_nilbackend.go
-secondary += $d/requests.txt
-
-ifeq (1,$(words $(MAKEFILE_LIST)))
-
-all: generate
-.PHONY: all
-
-generate: $(generate)
-.PHONY: generate
-
-clean:
-	rm -f -- $(secondary)
-.PHONY: clean
-maintainer-clean: clean
-	rm -f -- $(generate)
-.PHONY: maintainer-clean
-
-.DELETE_ON_ERROR:
-.SECONDARY:
-
-else
-
-# fix these to the current value of `d`
-generate := $(generate)
-secondary := $(secondary)
+generate += $(srcdir)/server/interface_backend.go
+generate += $(srcdir)/server/func_handlerequest.go
+generate += $(srcdir)/server/type_nilbackend.go
+generate_secondary += $(srcdir)/requests.txt
 
+ifeq (1,$(words $(MAKEFILE_LIST)))
+  include common.mk
 endif
-
-$d/requests.txt: $d/nslcd_h.go $d/Makefile
+
+$(srcdir)/requests.txt: $(srcdir)/nslcd_h.go $(srcdir)/Makefile
 	< $< grep -Eo '\btype Request_([^_ ]+)(_\S+)?' | sed 's/^type Request_//' > $@
 
 %.go: %.go.sh
-	./$^ > $@
+	$(call rel,$^) > $@
 
-$d/server/interface_backend.go: $d/requests.txt
-$d/server/func_handlerequest.go: $d/requests.txt
-$d/server/type_nilbackend.go: $d/server/interface_backend.go
+$(srcdir)/server/interface_backend.go: $(srcdir)/requests.txt
+$(srcdir)/server/func_handlerequest.go: $(srcdir)/requests.txt
+$(srcdir)/server/type_nilbackend.go: $(srcdir)/server/interface_backend.go
-- 
cgit v1.2.3