X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=m4%2Fgengetopt%2Fmakefile;h=5130ddd1d7779790250ac52eb2e263503a1002c7;hp=ada70d198b496abc98fb5ed462180f81d4c0d99a;hb=73f77a6699bb6f2345f20d8ed09b1ec6c6bf6435;hpb=e6e3a404091110ac770f65dad64e194f5900cd27

diff --git a/m4/gengetopt/makefile b/m4/gengetopt/makefile
index ada70d19..5130ddd1 100644
--- a/m4/gengetopt/makefile
+++ b/m4/gengetopt/makefile
@@ -13,26 +13,15 @@ $(cmdline_dir)/%.cmdline.h $(cmdline_dir)/%.cmdline.c: $(ggo_dir)/%.ggo | $(cmdl
 	@[ -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
+	@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) --debug=i $< 3>&1 1>/dev/null 2>&3 \
-		| awk '{if ($$0 ~ "^m4debug: input read from ") \
-		print "$(ggo_dir)/$(*F).ggo: " $$NF}' > $@
+	$(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) $< > $@
-
-$(help2man_dir)/para_%: $(ggo_dir)/%.ggo | $(help2man_dir)
-	@[ -z "$(Q)" ] || echo 'G2X $<'
-	$(Q) printf "#!/bin/sh\nif [ \"\$$1\" = '--version' ]; then \
-			$(GENGETOPT) $(ggo_opts) --show-version < $<; \
-		elif [ \"\$$1\" = '--help' ]; then \
-			$(GENGETOPT)  $(ggo_opts) --show-detailed-help < $<; \
-		else \
-			exit 1; \
-		fi\n" > $@.tmp
-	$(Q) chmod 755 $@.tmp && mv $@.tmp $@