Fixed source file building rules for GNU make >

The way VPATH is handled and $@ expands has changed between GNU make 3.79
and 3.80.

darcs-hash:20060313180402-65a35-2e1b066be5156428f9959659c66ac118213a69bf.gz

libsofia-sip-ua/http/Makefile.am

@@ -69,14 +69,22 @@ MSG_PARSER_AWK = $(srcdir)/../msg/msg_parser.awk
 
 AWK_HTTP_AWK = $(AWK) -f $(MSG_PARSER_AWK) module=http
 
-sofia-sip/http_tag.h: $(srcdir)/sofia-sip/http_tag.h.in $(MSG_PARSER_AWK)
-sofia-sip/http_protos.h: $(srcdir)/sofia-sip/http_protos.h.in $(MSG_PARSER_AWK)
+sofia-sip/http_tag.h: sofia-sip/http_tag.h.in $(MSG_PARSER_AWK)
+sofia-sip/http_protos.h: sofia-sip/http_protos.h.in $(MSG_PARSER_AWK)
 http_tag.c: http_tag.c.in $(MSG_PARSER_AWK)
 http_parser_table.c: http_parser_table.c.in $(MSG_PARSER_AWK)
 
-http_tag.c $(BUILT_H): $(srcdir)/sofia-sip/http.h
+sofia-sip/http_protos.h: sofia-sip/http.h
 	@-mkdir sofia-sip 2>/dev/null || true
-	$(AWK_HTTP_AWK) PR=$@ TEMPLATE=$(srcdir)/$@.in $<
+	$(AWK_HTTP_AWK) PR=$@ TEMPLATE=$(srcdir)/sofia-sip/http_protos.h.in $<
 
-http_parser_table.c: $(srcdir)/sofia-sip/http.h
-	$(AWK_HTTP_AWK) PT=$@ TEMPLATE=$(srcdir)/$@.in MC_HASH_SIZE=127 $<
+sofia-sip/http_tag.h: sofia-sip/http.h
+	@-mkdir sofia-sip 2>/dev/null || true
+	$(AWK_HTTP_AWK) PR=$@ TEMPLATE=$(srcdir)/sofia-sip/http_tag.h.in $<
+
+http_tag.c: sofia-sip/http.h
+	$(AWK_HTTP_AWK) PR=$@ TEMPLATE=$(srcdir)/http_tag.c.in $<
+
+http_parser_table.c: sofia-sip/http.h
+	$(AWK_HTTP_AWK) PT=$@ TEMPLATE=$(srcdir)/http_parser_table.c.in \
+		MC_HASH_SIZE=127 $<

libsofia-sip-ua/msg/Makefile.am

@@ -85,32 +85,32 @@ AWK_MSG_AWK = $(AWK) -f $(MSG_PARSER_AWK)
 test_protos.h: test_protos.h.in $(MSG_PARSER_AWK)
 test_table.c: test_table.c.in $(MSG_PARSER_AWK)
 
-sofia-sip/msg_mime_protos.h: $(srcdir)/sofia-sip/msg_mime_protos.h.in 
-sofia-sip/msg_protos.h: $(srcdir)/sofia-sip/msg_protos.h.in 
-msg_mime_table.c: $(srcdir)/msg_mime_table.c.in $(MSG_PARSER_AWK)
+sofia-sip/msg_mime_protos.h: sofia-sip/msg_mime_protos.h.in
+sofia-sip/msg_protos.h: sofia-sip/msg_protos.h.in
+msg_mime_table.c: msg_mime_table.c.in $(MSG_PARSER_AWK)
 
 sofia-sip/msg_mime_protos.h sofia-sip/msg_protos.h: $(MSG_PARSER_AWK)
 
-test_protos.h: $(srcdir)/test_class.h
+test_protos.h: test_class.h
 	$(AWK_MSG_AWK) module=msg_test NO_MIDDLE=1 NO_LAST=1 \
-		PR=$@ TEMPLATE=$(srcdir)/$@.in $<
+		PR=$@ TEMPLATE=$(srcdir)/test_protos.h.in $<
 
-test_table.c: $(srcdir)/test_class.h 
+test_table.c: test_class.h 
 	$(AWK_MSG_AWK) module=msg_test prefix=msg \
 		MC_HASH_SIZE=127 multipart=msg_multipart \
-		PT=$@ TEMPLATE=$(srcdir)/$@.in $<
+		PT=$@ TEMPLATE=$(srcdir)/test_table.c.in $<
 
-sofia-sip/msg_protos.h: $(srcdir)/sofia-sip/msg_mime.h
+sofia-sip/msg_protos.h: sofia-sip/msg_mime.h
 	@-mkdir sofia-sip 2>/dev/null || true
 	$(AWK_MSG_AWK) module=msg NO_FIRST=1 NO_MIDDLE=1 \
-		PR=$@ TEMPLATE=$(srcdir)/$@.in $<
+		PR=$@ TEMPLATE=$(srcdir)/sofia-sip/msg_protos.h.in $<
 
-sofia-sip/msg_mime_protos.h: $(srcdir)/sofia-sip/msg_mime.h
+sofia-sip/msg_mime_protos.h: sofia-sip/msg_mime.h
 	@-mkdir sofia-sip 2>/dev/null || true
 	$(AWK_MSG_AWK) module=msg NO_FIRST=1 NO_LAST=1 \
-		PR=$@ TEMPLATE=$(srcdir)/$@.in $<
+		PR=$@ TEMPLATE=$(srcdir)/sofia-sip/msg_mime_protos.h.in $<
 
-msg_mime_table.c: $(srcdir)/sofia-sip/msg_mime.h
+msg_mime_table.c: sofia-sip/msg_mime.h
 	$(AWK_MSG_AWK) module=msg_multipart \
 		tprefix=msg prefix=mp MC_HASH_SIZE=127 \
-		PT=$@ TEMPLATE=$(srcdir)/$@.in $<
+		PT=$@ TEMPLATE=$(srcdir)/msg_mime_table.c.in $<

libsofia-sip-ua/sip/Makefile.am

@@ -109,20 +109,31 @@ AWK_SIP_AWK = $(AWK) -f $(MSG_PARSER_AWK) module=sip
 #
 sip_parser_table.c: sip_bad_mask
 
-sofia-sip/sip_hclasses.h: $(srcdir)/sofia-sip/sip_hclasses.h.in 
-sofia-sip/sip_protos.h: $(srcdir)/sofia-sip/sip_protos.h.in
-sofia-sip/sip_tag.h: $(srcdir)/sofia-sip/sip_tag.h.in 
+sofia-sip/sip_hclasses.h: sofia-sip/sip_hclasses.h.in
+sofia-sip/sip_protos.h: sofia-sip/sip_protos.h.in
+sofia-sip/sip_tag.h: sofia-sip/sip_tag.h.in
 
 $(GENERATED_H): $(MSG_PARSER_AWK)
 
 sip_parser_table.c: sip_parser_table.c.in $(MSG_PARSER_AWK)
 sip_tag.c: sip_tag.c.in $(MSG_PARSER_AWK)
 
-sip_tag.c $(GENERATED_H): $(srcdir)/sofia-sip/sip.h
+sofia-sip/sip_hclasses.h: sofia-sip/sip.h
 	@-mkdir sofia-sip 2>/dev/null || true
-	$(AWK_SIP_AWK) PR=$@ TEMPLATE=$(srcdir)/$@.in $<
+	$(AWK_SIP_AWK) PR=$@ TEMPLATE=$(srcdir)/sofia-sip/sip_hclasses.h.in $<
 
-sip_parser_table.c: $(srcdir)/sofia-sip/sip.h
-	$(AWK_SIP_AWK) PT=$@ TEMPLATE=$(srcdir)/$@.in \
+sofia-sip/sip_protos.h: sofia-sip/sip.h
+	@-mkdir sofia-sip 2>/dev/null || true
+	$(AWK_SIP_AWK) PR=$@ TEMPLATE=$(srcdir)/sofia-sip/sip_protos.h.in $<
+
+sofia-sip/sip_tag.h: sofia-sip/sip.h
+	@-mkdir sofia-sip 2>/dev/null || true
+	$(AWK_SIP_AWK) PR=$@ TEMPLATE=$(srcdir)/sofia-sip/sip_tag.h.in $<
+
+sip_tag.c: sofia-sip/sip.h
+	$(AWK_SIP_AWK) PR=$@ TEMPLATE=$(srcdir)/sip_tag.c.in $<
+
+sip_parser_table.c: sofia-sip/sip.h
+	$(AWK_SIP_AWK) PT=$@ TEMPLATE=$(srcdir)/sip_parser_table.c.in \
 		FLAGFILE=$(srcdir)/sip_bad_mask \
 		MC_HASH_SIZE=127 MC_SHORT_SIZE=26 $<

libsofia-sip-ua/sofia.am

@@ -4,7 +4,7 @@
 built-sources: $(BUILT_SOURCES)
 
 clean-built-sources:
-	@-rm -rf $(BUILT_SOURCES)
+	-rm -rf $(BUILT_SOURCES) $(BUILT_SOURCES:%=$(srcdir)/%)
 
 # rules for building tag files