diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-18 14:37:01 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-18 14:37:01 +0000 |
| commit | d0bc7895eb58f64ef2f6bca236d02093ef05c4bd (patch) | |
| tree | 4266b5907e7997e70da9fa99cc4ae4d159f1465d /solenv/inc/tg_shl.mk | |
| parent | 2c16d8bfc2f7a12be44d5f1e2a5c593cdc83465c (diff) | |
CWS-TOOLING: integrate CWS mingwport24
2009-09-13 02:15:22 +0200 tono r276097 : i#105033: mingw port: accept incomplete deflib
2009-09-12 15:14:34 +0200 tono r276096 : i#105012: mingw port: $(PATH) should be quoted
2009-09-12 15:12:49 +0200 tono r276095 : i#105011: mingw port: berkeleydb fix
2009-09-12 15:11:39 +0200 tono r276094 : i#105010: mingw port: decline libdl
2009-09-12 15:10:21 +0200 tono r276093 : i#105009: mingw port: sal/osl/w32/file_dirvol.cxx needs ctype.h
2009-09-12 15:08:27 +0200 tono r276092 : reverting changes to revise log messages
2009-09-12 11:55:48 +0200 tono r276090 : i#105014: mingw port: change to latest w32api and mingw runtime
2009-09-12 11:52:12 +0200 tono r276089 : i#105013: mingw port: fix gas error in call.s in bridges
2009-09-12 11:42:04 +0200 tono r276088 : mingw port: should be quoted
2009-09-12 11:35:35 +0200 tono r276087 : mingw port: berkeleydb fix
2009-09-12 11:32:34 +0200 tono r276086 : mingw port: decline libdl
2009-09-12 11:20:50 +0200 tono r276085 : mingw port: sal/osl/w32/file_dirvol.cxx needs ctype.h
Diffstat (limited to 'solenv/inc/tg_shl.mk')
| -rw-r--r-- | solenv/inc/tg_shl.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index dc15752b306b..75fea561166c 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -330,13 +330,13 @@ $(SHL$(TNR)TARGETN) : \ @echo dlltool --input-def $(SHL$(TNR)DEF) \ --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \ --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @noop $(assign ALL$(TNR)OBJLIST:=$(STDOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) $(shell $(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB$(TNR)NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd -.ELSE # "$(DEFLIB$(TNR)NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)/$(@:b)_exp.o \ - $(STDOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \ - `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @noop $(assign DEF$(TNR)OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) + @noop $(foreach,i,$(DEF$(TNR)OBJLIST) $(assign ALL$(TNR)OBJLIST:=$(ALL$(TNR)OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB$(TNR)NAME)"!="" + @echo --output-exp $(MISC)/$(@:b)_exp.o \ + $(ALL$(TNR)OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \ `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ |