diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2005-11-10 15:06:21 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2005-11-10 15:06:21 +0000 |
| commit | 19eed259a6ad682cfc8afd046b7b7f2b3ccb0846 (patch) | |
| tree | 48ea0bf3ef8cd2f222281913c8053f84ed6ceece /bin | |
| parent | 2e25cf036206794a46d37de029afc4ab97c1f464 (diff) | |
| download | ATCD-19eed259a6ad682cfc8afd046b7b7f2b3ccb0846.tar.gz | |
ChangeLogTag: Thu Nov 10 09:05:58 2005 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index 8796d250439..9c6b6e15f70 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -19,7 +19,7 @@ BIN_UNCHECKED = <%if(targetoutdir)%><%targetoutdir%><%endif%><%exename%> <%if(staticname)%> ## LIB may be set to empty later on in this file -LIB_UNCHECKED = <%if(targetoutdir)%><%targetoutdir%><%endif%>lib<%staticname%>.a +LIB_UNCHECKED = <%if(targetoutdir)%><%targetoutdir%><%endif%>lib<%libname_prefix%><%staticname%>.a LIB = $(LIB_UNCHECKED) <%if(!sharedname)%> static_libs_only = 1 @@ -28,7 +28,7 @@ static_libs_only = 1 <%if(sharedname)%> ## SHLIB may be set to empty later on in this file -SHLIB_UNCHECKED = <%if(targetoutdir)%><%targetoutdir%><%endif%>lib<%sharedname%>.$(SOEXT) +SHLIB_UNCHECKED = <%if(targetoutdir)%><%targetoutdir%><%endif%>lib<%libname_prefix%><%sharedname%>.$(SOEXT) SHLIB = $(SHLIB_UNCHECKED) <%endif%> <%if(tao || ciao)%> @@ -68,10 +68,10 @@ FILES = \ XERCESLIB ?= <%xerceslib%> <%endif%> <%if(exename)%> -LDLIBS =<%foreach(libs lit_libs)%> -l<%lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%> +LDLIBS =<%foreach(libs)%> -l<%libname_prefix%><%lib%><%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%> <%else%> <%if(sharedname)%> -ACE_SHLIBS =<%foreach(libs lit_libs)%> -l<%lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%> +ACE_SHLIBS =<%foreach(libs)%> -l<%libname_prefix%><%lib%><%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%> <%endif%> <%endif%> <%if(tao_idl)%> @@ -187,7 +187,7 @@ else ifeq ($(findstring k, $(MAKEFLAGS)),k) LIBCHECK = 1 else - LIBCHECK ?= $(filter-out $(foreach lib,<%libs%>,$(findstring $(lib),$(foreach libpath,<%libpaths%> /usr/lib $(INSLIB),$(wildcard $(libpath)/lib$(lib).* $(libpath)/$(lib).lib)))),<%libs%>) + LIBCHECK ?= $(filter-out $(foreach lib,<%foreach(libs)%><%libname_prefix%><%lib%><%fornotlast(" ")%><%endfor%>,$(findstring $(lib),$(foreach libpath,<%libpaths%> /usr/lib $(INSLIB),$(wildcard $(libpath)/lib$(lib).* $(libpath)/$(lib).lib)))),<%foreach(libs)%><%libname_prefix%><%lib%><%fornotlast(" ")%><%endfor%>) ifeq ($(LIBCHECK),) LIBCHECK = 1 endif @@ -600,7 +600,7 @@ endif ifneq ($(VXWORKSLINK),true) <%if(libs && libpaths)%> ifeq ($(static_libs_only), 1) - DEPLIBS = $(foreach lib, <%libs%> <%lit_libs%>, $(foreach libpath, <%libpaths%>, $(wildcard $(libpath)/lib$(lib).a))) + DEPLIBS = $(foreach lib,<%foreach(libs)%> <%libname_prefix%><%lib%><%endfor%> <%lit_libs%>, $(foreach libpath, <%libpaths%>, $(wildcard $(libpath)/lib$(lib).a))) endif <%endif%> |