summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ.T. Conklin <johntconklin@users.noreply.github.com>2004-08-08 06:19:00 +0000
committerJ.T. Conklin <johntconklin@users.noreply.github.com>2004-08-08 06:19:00 +0000
commit09cc055ca4e607a740917386aeff9a21a8a4d0fc (patch)
tree491a090cb2748039d27ccfc62a1222f24508dff3
parentb4247bdf9b899ad9b5216ff00c0cdb49d9813a3f (diff)
downloadMPC-09cc055ca4e607a740917386aeff9a21a8a4d0fc.tar.gz
ChangeLogTag: Sat Aug 7 23:19:33 2004 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--ChangeLog7
-rw-r--r--templates/automake.mpd8
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3eee29a7..aa3a0d86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Aug 7 23:19:33 2004 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * templates/automake.mpd:
+ Introduce an intermediate dependency between custom input
+ and output files so that only one instance of the command
+ is spawned per input file with parallel make.
+
Thu Aug 5 14:57:19 2004 J.T. Conklin <jtc@acorntoolworks.com>
* templates/automake.mpd:
diff --git a/templates/automake.mpd b/templates/automake.mpd
index f73f66b6..d4f7ef44 100644
--- a/templates/automake.mpd
+++ b/templates/automake.mpd
@@ -13,16 +13,20 @@ BUILT_SOURCES += \
CLEANFILES += \
<%foreach(custom_type->input_file->output_files)%>
- <%custom_type->input_file->output_file%><%fornotlast(" \\")%>
+ <%custom_type->input_file->output_file%> \
<%endfor%>
+ <%basenoextension(custom_type->input_file)%>-stamp
+
+<%foreach(custom_type->input_file->output_files)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%fornotlast(" ")%><%endfor%>: <%basenoextension(custom_type->input_file)%>-stamp
-<%foreach(custom_type->input_file->output_files)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%fornotlast(" ")%><%endfor%>: <%custom_type->input_file%>
+<%basenoextension(custom_type->input_file)%>-stamp: $(srcdir)/<%custom_type->input_file%>
<%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(srcdir)/<%custom_type->input_file%><%if(custom_type->output_option)%><%custom_type->output_option%> $@<%endif%>
<%if(custom_type->postcommand)%>
<%foreach(custom_type->input_file->output_files)%>
<%custom_type->postcommand()%>
<%endfor%>
<%endif%>
+ @touch $@
<%endif%>
<%endfor%>