diff options
| author | J.T. Conklin <johntconklin@users.noreply.github.com> | 2004-08-04 18:47:25 +0000 |
|---|---|---|
| committer | J.T. Conklin <johntconklin@users.noreply.github.com> | 2004-08-04 18:47:25 +0000 |
| commit | bd51a9308891b317cb14a69937bfdae850c65487 (patch) | |
| tree | 1a519adae2a0860366f17f4a367ba41918a3d2d7 | |
| parent | 9b4434e682f98644801fab430b50ccc0d38522ba (diff) | |
| download | MPC-bd51a9308891b317cb14a69937bfdae850c65487.tar.gz | |
ChangeLogTag: Wed Aug 4 11:47:06 2004 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | templates/automake.mpd | 22 |
2 files changed, 22 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Wed Aug 4 11:47:06 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * templates/automake.mpd: + Use technique pioneered in the last checkin to remove the + $(DUMMY_VALUE...) hack from _CPPFLAGS definitions. + Wed Aug 4 11:23:04 2004 J.T. Conklin <jtc@acorntoolworks.com> * templates/automake.mpd: diff --git a/templates/automake.mpd b/templates/automake.mpd index 1dde072b..3c6e34a3 100644 --- a/templates/automake.mpd +++ b/templates/automake.mpd @@ -48,21 +48,31 @@ CLEANFILES += \ <%else%> lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_CPPFLAGS = \ <%endif%> - -I$(top_builddir) -I$(top_srcdir) \ -<%if(includes)%><%foreach(includes)%> -I<%include%><%endfor%> \<%endif%> + -I$(top_builddir) \ + -I$(top_srcdir)<%if(includes || defines || common_defines || need_staticflags || dynamicflags)%> \<%endif%> +<%if(includes)%> +<%foreach(includes)%> + -I<%include%><%if(defines || common_defines || macros || type_is_static || need_staticflags || dynamicflags)%> \<%else%><%fornotlast(" \\")%><%endif%> +<%endfor%> +<%endif%> <%if(defines || common_defines || macros)%> -<%foreach(defines common_defines macros)%> -D<%define%><%endfor%> \ +<%foreach(defines common_defines macros)%> + -D<%define%><%if(type_is_static || need_staticflags || dynamicflags)%> \<%else%><%fornotlast(" \\")%><%endif%> +<%endfor%> <%endif%> <%if(type_is_static || need_staticflags)%> <%if(staticflags)%> -<%foreach(staticflags)%> -D<%staticflag%><%endfor%> \ +<%foreach(staticflags)%> + -D<%staticflag%><%fornotlast(" \\")%> +<%endfor%> <%endif%> <%else%> <%if(dynamicflags)%> -<%foreach(dynamicflags)%> -D<%dynamicflag%><%endfor%> \ +<%foreach(dynamicflags)%> + -D<%dynamicflag%><%fornotlast(" \\")%> +<%endfor%> <%endif%> <%endif%> - $(DUMMY_VALUE_NOT_ENDING_IN_BACKSLASH) <%if(exename)%> <%normalize(exename)%>_SOURCES = \ |