summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2011-12-09 09:22:52 +0100
committerAndras Timar <atimar@suse.com>2011-12-09 09:23:45 +0100
commit567e4ba27300f5d38775a5f8c7ba8fd01163df35 (patch)
treebe7a054addd484d8bb49f0cb7ea1ae77aa9c353b /sdext
parent738cef29aa53e60c839d686c0e018e9c912f20b9 (diff)
we don't pack runtime with internal extensions
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/presenter/makefile.mk41
1 files changed, 0 insertions, 41 deletions
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index a0d8d0f939d6..fd95093f36a3 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -311,47 +311,6 @@ $(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
$(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
@-$(MKDIRHIER) $(@:d)
+$(COPY) $< $@
-.IF "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
- .IF "$(COM)"=="GCC"
- $(GNUCOPY) $(SOLARBINDIR)$/mingwm10.dll $(ZIP1DIR)
- .ELSE
- .IF "$(PACKMS)"!=""
- .IF "$(CCNUMVER)" <= "001399999999"
- $(GNUCOPY) $(PACKMS)$/msvcr71.dll $(ZIP1DIR)
- $(GNUCOPY) $(PACKMS)$/msvcp71.dll $(ZIP1DIR)
- .ELSE
- .IF "$(CCNUMVER)" <= "001499999999"
- $(GNUCOPY) $(PACKMS)$/msvcr80.dll $(ZIP1DIR)
- $(GNUCOPY) $(PACKMS)$/msvcp80.dll $(ZIP1DIR)
- $(GNUCOPY) $(PACKMS)$/msvcm80.dll $(ZIP1DIR)
- $(GNUCOPY) $(PACKMS)$/Microsoft.VC80.CRT.manifest $(ZIP1DIR)
- .ELSE
- $(GNUCOPY) $(PACKMS)$/msvcr90.dll $(ZIP1DIR)
- $(GNUCOPY) $(PACKMS)$/msvcp90.dll $(ZIP1DIR)
- $(GNUCOPY) $(PACKMS)$/msvcm90.dll $(ZIP1DIR)
- $(GNUCOPY) $(PACKMS)$/Microsoft.VC90.CRT.manifest $(ZIP1DIR)
- .ENDIF
- .ENDIF
- .ELSE # "$(PACKMS)"!=""
- .IF "$(CCNUMVER)" <= "001399999999"
- $(GNUCOPY) $(SOLARBINDIR)$/msvcr71.dll $(ZIP1DIR)
- $(GNUCOPY) $(SOLARBINDIR)$/msvcp71.dll $(ZIP1DIR)
- .ELSE
- .IF "$(CCNUMVER)" <= "001499999999"
- $(GNUCOPY) $(SOLARBINDIR)$/msvcr80.dll $(ZIP1DIR)
- $(GNUCOPY) $(SOLARBINDIR)$/msvcp80.dll $(ZIP1DIR)
- $(GNUCOPY) $(SOLARBINDIR)$/msvcm80.dll $(ZIP1DIR)
- $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC80.CRT.manifest $(ZIP1DIR)
- .ELSE
- $(GNUCOPY) $(SOLARBINDIR)$/msvcr90.dll $(ZIP1DIR)
- $(GNUCOPY) $(SOLARBINDIR)$/msvcp90.dll $(ZIP1DIR)
- $(GNUCOPY) $(SOLARBINDIR)$/msvcm90.dll $(ZIP1DIR)
- $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC90.CRT.manifest $(ZIP1DIR)
- .ENDIF
- .ENDIF
- .ENDIF # "$(PACKMS)"!=""
- .ENDIF #"$(COM)"=="GCC"
-.ENDIF #"$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)