Skip to content

Commit be6d68b

Browse files
authored
Merge pull request DOCGroup#179 from simonmcqueen/master
Create variable for shared obj lib extension. It is used to check pre reqs
2 parents 4cbc59f + 436fd25 commit be6d68b

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

modules/MakeWorkspaceBase.pm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ sub workspace_preamble {
6161

6262
## Optionally print the workspace comment
6363
$self->print_workspace_comment($fh,
64+
'# -*-Makefile-*-', $crlf,
6465
'#----------------------------------------------------------------------------', $crlf,
6566
'# ', $name, $crlf,
6667
'#', $crlf,

templates/make.mpd

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# -*-Makefile-*-
12
#----------------------------------------------------------------------------
23
# Macros
34
#----------------------------------------------------------------------------
@@ -119,8 +120,9 @@ AREXT = <%lib_ext%>
119120
LIB = $(LTARGETDIR)$(LIBPREFIX)<%staticname%>$(LIBSUFFIX)$(AREXT)
120121
<%endif%>
121122
<%endif%>
122-
<%if(dll_ext && sharedname)%>
123+
<%if(dll_ext)%>
123124
SOEXT = <%dll_ext%>
125+
<%if(sharedname)%>
124126
SHTARGETDIR = <%if(dllout)%><%dllout%><%if(!compares(dllout, .))%><%output_dir_ext%><%endif%><%else%><%libout%><%if(!compares(libout, .))%><%output_dir_ext%><%endif%><%endif%><%slash%><%targetoutdir%>
125127
<%if(version && versupport)%>
126128
SHLIB_BASE = $(LIBPREFIX)<%sharedname%>$(LIBSUFFIX)$(SOEXT)
@@ -130,6 +132,7 @@ SHLIB = $(SHTARGETDIR)$(LIBPREFIX)<%sharedname%>$(LIBSUFFIX)$(SOEXT)
130132
SHFLAGS = <%shflags%>
131133
<%endif%>
132134
<%endif%>
135+
<%endif%>
133136
SRC =<%if(pch_source && pchsupport)%> <%pch_source%><%endif%> <%source_files%>
134137
LINK.cc = <%if(dld)%><%dld%> $(LDFLAGS)<%else%>$(LD) $(LDFLAGS)<%endif%>
135138
<%if(!contains(language, java))%>

0 commit comments

Comments
 (0)