From 3e43aa4ac1374977ec8737421ab6fa920c5eb0cd Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 1 Jan 2017 22:09:58 -0700 Subject: tidy Makefiles --- nslcd_proto/.gitignore | 1 - nslcd_proto/Makefile | 28 ---------------------------- nslcd_proto/common.mk | 33 --------------------------------- nslcd_server/.gitignore | 1 + nslcd_server/Makefile | 15 ++++++++------- 5 files changed, 9 insertions(+), 69 deletions(-) delete mode 100644 nslcd_proto/.gitignore delete mode 100644 nslcd_proto/Makefile delete mode 100644 nslcd_proto/common.mk diff --git a/nslcd_proto/.gitignore b/nslcd_proto/.gitignore deleted file mode 100644 index 9330212..0000000 --- a/nslcd_proto/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/requests.txt diff --git a/nslcd_proto/Makefile b/nslcd_proto/Makefile deleted file mode 100644 index c031de4..0000000 --- a/nslcd_proto/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) 2015-2016 Luke Shumaker -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA - -files.src.gen += requests.txt - -files.generate: $(files.src.gen) -maintainer-clean: - rm -f -- $(files.src.gen) -.PHONY: files.generate maintainer-clean - -requests.txt: nslcd_h.go Makefile - < $< grep -Eo '\btype Request_([^_ ]+)(_\S+)?' | sed 's/^type Request_//' > $@ - -.DELETE_ON_ERROR: diff --git a/nslcd_proto/common.mk b/nslcd_proto/common.mk deleted file mode 100644 index 1496356..0000000 --- a/nslcd_proto/common.mk +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright © 2015-2016 Luke Shumaker -# This work is free. You can redistribute it and/or modify it under the -# terms of the Do What The Fuck You Want To Public License, Version 2, -# as published by Sam Hocevar. See http://www.wtfpl.net/ for more details. - -all: build -.PHONY: all - -generate: $(addprefix $(srcdir)/,$(std.gen_files)) -.PHONY: generate - -configure: generate $(addprefix $(outdir)/,$(std.cfg_files)) -.PHONY: configure - -build: configure $(addprefix $(outdir)/,$(std.out_files)) -.PHONY: build - -install: build $(addprefix $(DESTDIR),$(std.sys_files)) -.PHONY: install - -maintainer-clean: private files=$(addprefix $(srcdir)/,$(std.gen_files) $(std.secondary_gen_files)) # un-generate -distclean : private files=$(addprefix $(outdir)/,$(std.cfg_files) $(std.secondary_cfg_files)) # un-configure -clean : private files=$(addprefix $(outdir)/,$(std.out_files) $(std.secondary_out_files)) # un-build -uninstall : private files=$(addprefix $(DESTDIR),$(std.sys_files) ) # un-install - -distclean: clean -maintainer-clean: distclean - -clean distclean maintainer-clean uninstall: - rm -f -- $(sort $(filter-out %/,$(files))) - rm -f -r -- $(sort $(filter %/,$(files))) - rmdir -p -- $(sort $(dir $(files))) 2>/dev/null || true -.PHONY: clean distclean maintainer-clean uninstall diff --git a/nslcd_server/.gitignore b/nslcd_server/.gitignore index ff46733..8a2b4eb 100644 --- a/nslcd_server/.gitignore +++ b/nslcd_server/.gitignore @@ -1,3 +1,4 @@ /func_handlerequest.go /interface_backend.go /type_nilbackend.go +/requests.txt 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 +# Copyright (C) 2015-2017 Luke Shumaker # # 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-2-g168b