From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 26 Jun 2016 10:40:20 +0000 (+0200)
Subject: build: Remove m4/gengetopt.
X-Git-Tag: v0.6.0~2^2~15
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=8587981e8156ca725377792259ed653f112bcb98;ds=sidebyside

build: Remove m4/gengetopt.

This directory only contained a single file: the makefile for
generating the command line parsers with gengetopt. Since we no longer
rely on gengetopt, we may remove $(m4_ggo_dir), m4/gengetopt/makefile
and the corresponding include directive in Makefile.real.
---

diff --git a/Makefile.real b/Makefile.real
index 53607d62..ca2bab53 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -35,7 +35,6 @@ m4depdir := $(build_dir)/m4deps
 help2man_dir := $(build_dir)/help2man
 lls_suite_dir := $(build_dir)/lls
 lls_m4_dir := m4/lls
-m4_ggo_dir := m4/gengetopt
 test_dir := t
 
 # sort removes duplicate words, which is all we need here
@@ -96,7 +95,6 @@ man: $(man_pages)
 tarball: $(tarball)
 
 include $(lls_m4_dir)/makefile
-include $(m4_ggo_dir)/makefile
 include $(test_dir)/makefile.test
 ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 -include $(deps)
diff --git a/m4/gengetopt/makefile b/m4/gengetopt/makefile
deleted file mode 100644
index 0db9d10e..00000000
--- a/m4/gengetopt/makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-define ggo_opts
-	--output-dir=$(cmdline_dir) \
-	--set-version="$(GIT_VERSION)" \
-	--arg-struct-name=$(*F)_args_info \
-	--file-name=$(*F).cmdline \
-	--func-name=$(*F)_cmdline_parser \
-	--set-package="para_$(*F)"
-endef
-
-.PRECIOUS: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h $(ggo_dir)/%.ggo
-
-$(cmdline_dir)/%.cmdline.h $(cmdline_dir)/%.cmdline.c: $(ggo_dir)/%.ggo | $(cmdline_dir)
-	@[ -z "$(Q)" ] || echo 'GGO $<'
-	$(Q) $(GENGETOPT) $(ggo_opts) < $<
-ifeq ($(ggo_descriptions_declared),no)
-	@echo 'extern const char *$(*F)_args_info_description;' >> $(cmdline_dir)/$(*F).cmdline.h
-endif
-
-$(m4depdir)/%.m4d: $(m4_ggo_dir)/%.m4 | $(m4depdir)
-	@[ -z "$(Q)" ] || echo 'M4D $<'
-	$(Q) $(M4) -I $(m4_ggo_dir) -s $< \
-	| awk '{if ($$1 ~ /#line/) {gsub(/"/, "", $$3); if ($$3 != "$<") \
-	print "$(ggo_dir)/$(*F).ggo: " $$3}}' | sort | uniq > $@
-
-$(ggo_dir)/%.ggo: $(m4_ggo_dir)/%.m4 $(m4_ggo_dir)/header.m4 | $(ggo_dir)
-	@[ -z "$(Q)" ] || echo 'M4 $<'
-	$(Q) $(M4) -I $(m4_ggo_dir) $< > $@