[Halfs-cvs] admin Makefile.gengetopt,1.1.1.1,1.2

[<za...@us...>]

Update of /cvsroot/halfs/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1160

Modified Files:
	Makefile.gengetopt 
Log Message:
fix gengetopt support

Index: Makefile.gengetopt
===================================================================
RCS file: /cvsroot/halfs/admin/Makefile.gengetopt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.gengetopt	14 Jan 2006 00:07:09 -0000	1.1.1.1
+++ Makefile.gengetopt	13 Feb 2006 19:51:10 -0000	1.2
@@ -5,36 +5,40 @@
 #
 
 %$(CMDLINE_PARSER_SUFFIX).c: %.ggo
-	so=`cat $(MAKEFILE_LIST) | grep '^$(*F)_GGOFLAGS[ ]*=' | sed 's,^$(*F)_GGOFLAGS[ ]*=[ ]*\(.*\),\1,'`; \
+	so=`cat $(MAKEFILE_LIST) \
+	  | grep  '^$(subst .,_,$(subst -,_,$(*F)))_GGOFLAGS[ ]*=' \
+	  | sed 's,^$(subst .,_,$(subst -,_,$(*F)))_GGOFLAGS[ ]*=[ ]*\(.*\),\1,'`; \
 	$(GENGETOPT) $(AM_GGOFLAGS) $$so -i $< -F $(*F)$(CMDLINE_PARSER_SUFFIX)
+	list="fix_ggo_autoconf_issue fix_arg0 $(GGO_POSTGEN_ACTIONS)"`cat $(MAKEFILE_LIST) \
+	  | grep '^$(subst .,_,$(subst -,_,$(*F)))_GGO_POSTGEN_ACTIONS[ ]*=' \
+	  | sed 's,.*=[ ]*\(.*\),\1,'`; \
+	for i in $$list; do \
+	    $(MAKE) $(AM_MAKEFLAGS) $$i TGT_H_FILE=`basename $(@) .c`.h TGT_C_FILE=$(@) SRC_FILE=$(<); \
+	done
+
+%$(CMDLINE_PARSER_SUFFIX).h: %$(CMDLINE_PARSER_SUFFIX).c
+
+fix_ggo_autoconf_issue:
 	sed -e 's/HAVE_CONFIG_H/DONT_USE_CONFIG/' \
-	< $(*F)$(CMDLINE_PARSER_SUFFIX).c > $(*F)$(CMDLINE_PARSER_SUFFIX).c.tmp
-	mv -f $(*F)$(CMDLINE_PARSER_SUFFIX).c.tmp $(*F)$(CMDLINE_PARSER_SUFFIX).c
+	< $(TGT_C_FILE) > $(TGT_C_FILE).tmp
+	mv -f $(TGT_C_FILE).tmp $(TGT_C_FILE)
 	sed -e '/#ifndef PACKAGE/ {'  -e 'i \' -e '#undef PACKAGE' -e '}' \
 	    -e '/#ifndef VERSION/ {'  -e 'i \' -e '#undef VERSION' -e '}' \
 	    -e 's/HAVE_CONFIG_H/DONT_USE_CONFIG/' \
-	 < $(*F)$(CMDLINE_PARSER_SUFFIX).h > $(*F)$(CMDLINE_PARSER_SUFFIX).h.tmp
-	mv -f $(*F)$(CMDLINE_PARSER_SUFFIX).h.tmp $(*F)$(CMDLINE_PARSER_SUFFIX).h
-	$(MAKE) $(AM_MAKEFLAGS) fix_arg0 TGT_FILE=$(@)
-	list="$(GGO_POSTGEN_ACTIONS)"`cat $(MAKEFILE_LIST) \
-		| grep '^$(*F)_GGO_POSTGEN_ACTIONS[ ]*=' \
-		|  sed 's,.*=[ ]*\(.*\),\1,'`; \
-	for i in $$list; do \
-	    $(MAKE) $(AM_MAKEFLAGS) $$i TGT_FILE=$(@) SRC_FILE=$(<); \
-	done
-
-%$(CMDLINE_PARSER_SUFFIX).h: %$(CMDLINE_PARSER_SUFFIX).c ;
+	 < $(TGT_H_FILE) > $(TGT_H_FILE).tmp
+	mv -f $(TGT_H_FILE).tmp $(TGT_H_FILE)
 
 fix_arg0:
-	cat $(TGT_FILE) | sed \
+	cat $(TGT_C_FILE) | sed \
 	  -e 's,cmdline_parser_print_help[ ]*(void),cmdline_parser_print_help(const char* bin_prg_name),' \
-	  -e '/Usage:/ s,CMDLINE_PARSER_PACKAGE,bin_prg_name,' \
+	  -e '/Usage: %s/ s,CMDLINE_PARSER_PACKAGE,bin_prg_name,' \
+	  -e '/Usage: [^%]/ s,Usage: .* \[OPTIONS\]\(.*\)",Usage: %s [OPTIONS]\1"\, bin_prg_name,' \
 	  -e 's,cmdline_parser_print_help[ ]*();,cmdline_parser_print_help(argv[0]);,' \
-	  > $(TGT_FILE).tmp
-	mv -f $(TGT_FILE).tmp $(TGT_FILE)
-	cat `basename $(TGT_FILE) .c`.h | sed \
+	  > $(TGT_C_FILE).tmp
+	mv -f $(TGT_C_FILE).tmp $(TGT_C_FILE)
+	cat $(TGT_H_FILE) | sed \
 	  -e 's,cmdline_parser_print_help[ ]*(void),cmdline_parser_print_help(const char*),' \
-	  > `basename $(TGT_FILE) .c`.tmp
-	mv -f `basename $(TGT_FILE) .c`.tmp `basename $(TGT_FILE) .c`.h
+	  > $(TGT_H_FILE).tmp
+	mv -f $(TGT_H_FILE).tmp $(TGT_H_FILE)
 
 .PHONY: fix_arg0