Fixed generating header and tag files in http and sip.

darcs-hash:20051202084828-65a35-5d70fbedfb784b5114c76dcb712e045851581277.gz

libsofia-sip-ua/http/Makefile.am

@@ -66,13 +66,13 @@ TAG_DLL_FLAGS = DLLREF=1
 
 MSG_PARSER_AWK = $(srcdir)/../msg/msg_parser.awk
 
-AWK_MSG_AWK = $(AWK) -f $(MSG_PARSER_AWK) module=http
+AWK_HTTP_AWK = $(AWK) -f $(MSG_PARSER_AWK) module=http
 
 http_%.h: http_%.h.in $(MSG_PARSER_AWK)
 http_%.c: http_%.c.in $(MSG_PARSER_AWK)
 
-http_tag.c http_tag_ref.c http_protos.h http_tag.h: http.h
-	$(AWK_MSG_AWK) PR=$@ $<
+http_tag.c http_protos.h http_tag.h: http.h
+	$(AWK_HTTP_AWK) PR=$@ TEMPLATE=$(srcdir)/$@.in $<
 
 http_parser_table.c: http.h
-	$(AWK_MSG_AWK) PT=$@ MC_HASH_SIZE=127 MC_SHORT_SIZE=26 $<
+	$(AWK_HTTP_AWK) PT=$@ MC_HASH_SIZE=127 $<

libsofia-sip-ua/sip/Makefile.am

@@ -104,7 +104,7 @@ include ../sofia.am
 
 MSG_PARSER_AWK = $(srcdir)/../msg/msg_parser.awk
 
-AWK_MSG_AWK = $(AWK) -f $(MSG_PARSER_AWK) module=sip
+AWK_SIP_AWK = $(AWK) -f $(MSG_PARSER_AWK) module=sip
 
 #
 # Note: sip_bad_mask is used by nta to weed out bad messages
@@ -114,9 +114,9 @@ sip_parser_table.c: sip_bad_mask
 sip_%.h: sip_%.h.in $(MSG_PARSER_AWK)
 sip_%.c: sip_%.c.in $(MSG_PARSER_AWK)
 
-sip_tag.c sip_hclasses.h sip_protos.h sip_tag.h sip_rfc2543.h: sip.h
-	$(AWK_MSG_AWK) PR=$@ $<
+sip_tag.c sip_hclasses.h sip_protos.h sip_tag.h: sip.h
+	$(AWK_SIP_AWK) PR=$@ TEMPLATE=$(srcdir)/$@.in $<
 
 sip_parser_table.c: sip.h
-	$(AWK_MSG_AWK) PT=$@ FLAGFILE=$(srcdir)/sip_bad_mask \
+	$(AWK_SIP_AWK) PT=$@ FLAGFILE=$(srcdir)/sip_bad_mask \
 		MC_HASH_SIZE=127 MC_SHORT_SIZE=26 $<