Skip to content

Commit 1c454ac

Browse files
committed
Create variable for shared obj lib extension. It is used to check pre-reqs.
Fixes make template so that it works for e.g. TAO/tests/Hello.
1 parent 5aad93c commit 1c454ac

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

templates/make.mpd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,9 @@ AREXT = <%lib_ext%>
119119
LIB = $(LTARGETDIR)$(LIBPREFIX)<%staticname%>$(LIBSUFFIX)$(AREXT)
120120
<%endif%>
121121
<%endif%>
122-
<%if(dll_ext && sharedname)%>
122+
<%if(dll_ext)%>
123123
SOEXT = <%dll_ext%>
124+
<%if(sharedname)%>
124125
SHTARGETDIR = <%if(dllout)%><%dllout%><%if(!compares(dllout, .))%><%output_dir_ext%><%endif%><%else%><%libout%><%if(!compares(libout, .))%><%output_dir_ext%><%endif%><%endif%><%slash%><%targetoutdir%>
125126
<%if(version && versupport)%>
126127
SHLIB_BASE = $(LIBPREFIX)<%sharedname%>$(LIBSUFFIX)$(SOEXT)
@@ -130,6 +131,7 @@ SHLIB = $(SHTARGETDIR)$(LIBPREFIX)<%sharedname%>$(LIBSUFFIX)$(SOEXT)
130131
SHFLAGS = <%shflags%>
131132
<%endif%>
132133
<%endif%>
134+
<%endif%>
133135
SRC =<%if(pch_source && pchsupport)%> <%pch_source%><%endif%> <%source_files%>
134136
LINK.cc = <%if(dld)%><%dld%> $(LDFLAGS)<%else%>$(LD) $(LDFLAGS)<%endif%>
135137
<%if(!contains(language, java))%>

0 commit comments

Comments
 (0)