From 3e43aa4ac1374977ec8737421ab6fa920c5eb0cd Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 1 Jan 2017 22:09:58 -0700
Subject: tidy Makefiles

---
 nslcd_server/Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'nslcd_server/Makefile')

diff --git a/nslcd_server/Makefile b/nslcd_server/Makefile
index f1ff20f..06fe88c 100644
--- a/nslcd_server/Makefile
+++ b/nslcd_server/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016 Luke Shumaker <lukeshu@sbcglobal.net>
+# Copyright (C) 2015-2017 Luke Shumaker <lukeshu@sbcglobal.net>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,23 +15,24 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
-files.src.gen += interface_backend.go
 files.src.gen += func_handlerequest.go
+files.src.gen += interface_backend.go
 files.src.gen += type_nilbackend.go
+files.src.int += requests.txt
 
 files.generate: $(files.src.gen)
 maintainer-clean:
-	rm -f -- $(files.src.gen)
+	rm -f -- $(files.src.gen) $(files.src.int)
 .PHONY: files.generate maintainer-clean
 
 %.go: %.go.gen
 	./$^ > $@
 
-interface_backend.go: ../nslcd_proto/requests.txt
-func_handlerequest.go: ../nslcd_proto/requests.txt
+func_handlerequest.go: requests.txt
+interface_backend.go: requests.txt
 type_nilbackend.go: interface_backend.go
 
-../nslcd_proto/requests.txt:
-	$(MAKE) -C $(@D) $(@F)
+requests.txt: ../nslcd_proto/nslcd_h.go Makefile
+	< $< grep -Eo '\btype Request_([^_ ]+)(_\S+)?' | sed 's/^type Request_//' > $@
 
 .DELETE_ON_ERROR:
-- 
cgit v1.2.3