summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ.T. Conklin <johntconklin@users.noreply.github.com>2005-09-08 15:10:54 +0000
committerJ.T. Conklin <johntconklin@users.noreply.github.com>2005-09-08 15:10:54 +0000
commit31414107e2a06d938e884610707a9d752854c84e (patch)
tree49c392655d9592b9ca1dfe363f848762a25763ce
parent03b2998fbb7ec4fcf2a7972d06e3ffecd01058eb (diff)
downloadMPC-31414107e2a06d938e884610707a9d752854c84e.tar.gz
ChangeLogTag: Thu Sep 8 08:06:18 2005 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--ChangeLog9
-rw-r--r--templates/automake.mpd8
2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b5c69472..d4825108 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Sep 8 08:06:18 2005 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * templates/automake.mpd:
+
+ Changed to output compile_flags on separate lines.
+
+ Changed to sort lists of source, header, and inline files
+ to make output more deterministic.
+
Tue Sep 6 10:34:24 2005 Chad Elliott <elliott_c@ociweb.com>
* config/swig_perl.mpb:
diff --git a/templates/automake.mpd b/templates/automake.mpd
index 8c44141a..5ca1ea6e 100644
--- a/templates/automake.mpd
+++ b/templates/automake.mpd
@@ -91,7 +91,9 @@ lib<%if(sharedname)%><%normalize(sharedname)%><%else%><%normalize(staticname)%><
-D<%define%><%if(compile_flags || need_staticflags || dynamicflags)%> \<%else%><%fornotlast(" \\")%><%endif%>
<%endfor%>
<%if(compile_flags)%>
-<%compile_flags%><%if(need_staticflags || dynamicflags)%> \<%endif%>
+<%foreach(compile_flags)%>
+ <%compile_flags%><%if(need_staticflags || dynamicflags)%> \<%else%><%fornotlast(" \\")%><%endif%>
+<%endfor%>
<%endif%>
<%if(need_staticflags)%>
<%if(staticflags)%>
@@ -116,12 +118,12 @@ lib<%if(sharedname)%><%normalize(sharedname)%><%else%><%normalize(staticname)%><
<%else%>
lib<%if(sharedname)%><%normalize(sharedname)%><%else%><%normalize(staticname)%><%endif%>_la_SOURCES = \
<%endif%>
-<%foreach(source_files)%>
+<%foreach(source_file, sort(source_files))%>
<%source_file%><%if(exename)%><%if(header_files || inline_files)%> \<%else%><%fornotlast(" \\")%><%endif%><%else%><%fornotlast(" \\")%><%endif%>
<%endfor%>
<%if(exename)%>
<%if(header_files || inline_files)%>
-<%foreach(header_files inline_files)%>
+<%foreach(header_file, sort(header_files inline_files))%>
<%header_file%><%fornotlast(" \\")%>
<%endfor%>
<%endif%>