summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2005-07-05 15:26:15 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2005-07-05 15:26:15 +0000
commit5b1999b07147cd7d17ad085a3f1a3f06fcc78495 (patch)
tree3240c31675f3ddbd526d6e0229e787d7b0bcf178
parent2614a92263dda50adac1e8d3a7be0bee85e1e41b (diff)
downloadMPC-5b1999b07147cd7d17ad085a3f1a3f06fcc78495.tar.gz
ChangeLogTag: Tue Jul 5 10:25:18 2005 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ChangeLog8
-rw-r--r--templates/automake.mpd2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c169a86b..8a559d54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jul 5 10:25:18 2005 Chad Elliott <elliott_c@ociweb.com>
+
+ * templates/automake.mpd:
+
+ Added macros and compile_flags to outter if check to allow these
+ to be part of the CPPFLAGS (if none of the other variables in the
+ if are not defined).
+
Tue Jul 5 07:23:07 2005 Chad Elliott <elliott_c@ociweb.com>
* templates/vc7.mpd:
diff --git a/templates/automake.mpd b/templates/automake.mpd
index 4e8982d2..4dace4c3 100644
--- a/templates/automake.mpd
+++ b/templates/automake.mpd
@@ -86,7 +86,7 @@ CLEANFILES += \
<%if(install_this_target)%>lib<%else%>noinst<%endif%>_LTLIBRARIES += lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.la
<%endif%>
<%endif%>
-<%if(am_includes || defines || common_defines || need_staticflags || dynamicflags)%>
+<%if(am_includes || defines || common_defines || macros || need_staticflags || dynamicflags || compile_flags)%>
<%if(exename)%>
<%normalize(exename)%>_CPPFLAGS = \