diff options
| author | J.T. Conklin <johntconklin@users.noreply.github.com> | 2004-08-14 01:27:35 +0000 |
|---|---|---|
| committer | J.T. Conklin <johntconklin@users.noreply.github.com> | 2004-08-14 01:27:35 +0000 |
| commit | 80fbdea47707e2407c21604ce46f58c57e2809c2 (patch) | |
| tree | f56260f9fe276252bfa216a7afde7523b56e8389 | |
| parent | 32ada2c2f508d0cc9e77042274e483c646d0b2d5 (diff) | |
| download | MPC-80fbdea47707e2407c21604ce46f58c57e2809c2.tar.gz | |
ChangeLogTag: Fri Aug 13 18:31:01 2004 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | templates/automake.mpd | 36 | ||||
| -rw-r--r-- | templates/automakedll.mpt | 1 |
3 files changed, 31 insertions, 15 deletions
@@ -1,3 +1,12 @@ +Fri Aug 13 18:31:01 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * templates/automake.mpd: + Use INSTALL_THIS_TARGET to determine whether to use the + noinst_ prefix. + + * template/automakedll.mpt: + Define INSTALL_THIS_TARGET for use by automake.mpd. + Fri Aug 13 10:53:57 2004 J.T. Conklin <jtc@acorntoolworks.com> * templates/automake.mpd: diff --git a/templates/automake.mpd b/templates/automake.mpd index b7b2f05a..800a56e7 100644 --- a/templates/automake.mpd +++ b/templates/automake.mpd @@ -1,8 +1,17 @@ # @file <%project_file%> # # $Id$ +<%if(requires || avoids)%> +<%foreach(requires)%> +if BUILD_<%uc(require)%> +<%endfor%> +<%foreach(avoids)%> +if !BUILD_<%uc(avoid)%> +<%endfor%> +<%endif%> <%if(custom_types)%> + <%foreach(custom_types)%> <%foreach(custom_type->input_files)%> <%if(custom_type->input_file->output_files)%> @@ -41,23 +50,11 @@ CLEANFILES += \ <%endfor%> <%endif%> -<%foreach(requires)%> -if BUILD_<%uc(require)%> -<%endfor%> -<%foreach(avoids)%> -if !BUILD_<%uc(avoid)%> -<%endfor%> <%if(exename)%> -<%if(install)%>bin<%else%>noinst<%endif%>_PROGRAMS += <%exename%> +<%if(INSTALL_THIS_TARGET)%>bin<%else%>noinst<%endif%>_PROGRAMS += <%exename%> <%else%> -<%if(libout)%>lib<%else%>noinst<%endif%>_LTLIBRARIES += lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.la +<%if(INSTALL_THIS_TARGET)%>lib<%else%>noinst<%endif%>_LTLIBRARIES += lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.la <%endif%> -<%foreach(avoids)%> -endif -<%endfor%> -<%foreach(requires)%> -endif -<%endfor%> <%if(includes || defines || common_defines || need_staticflags || dynamicflags)%> <%if(exename)%> @@ -134,12 +131,21 @@ lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_LIBADD = \ <%if(!exename)%> <%if(header_files || inline_files || template_files || idl_files || pidl_files)%> -nobase_include_HEADERS += \ +<%if(INSTALL_THIS_TARGET)%>nobase_include<%else%>noinst<%endif%>_HEADERS += \ <%foreach(header_files inline_files template_files idl_files pidl_files)%> <%header_file%><%fornotlast(" \\")%> <%endfor%> <%endif%> <%endif%> +<%if(avoids || requires)%> + +<%foreach(avoids)%> +endif +<%endfor%> +<%foreach(requires)%> +endif +<%endfor%> +<%endif%> <%if(resource_files)%> EXTRA_DIST += \ diff --git a/templates/automakedll.mpt b/templates/automakedll.mpt index d24c5a57..67a3880a 100644 --- a/templates/automakedll.mpt +++ b/templates/automakedll.mpt @@ -4,3 +4,4 @@ conditional_include "common" linkflags = +INSTALL_THIS_TARGET = |