diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-12-13 21:19:49 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-12-13 21:19:49 +0100 |
commit | 4c20724e6644a3d865322e2a445813f8cd5339e1 (patch) | |
tree | 850e324e89314c9e7337729864a26ee337add918 /sdext | |
parent | f511b34a12998297333f900f252e9009033c2a76 (diff) |
Don't bundle MSVC runtime + don't dupplicate licenses
Diffstat (limited to 'sdext')
-rwxr-xr-x | sdext/source/presenter/makefile.mk | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index 501c99e8fd74..a72df145cb42 100755 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -312,7 +312,7 @@ $(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f) @-$(MKDIRHIER) $(@:d) +$(COPY) $< $@ -.IF "$(OS)$(CPU)"=="WNTI" +.IF "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES" .IF "$(COM)"=="GCC" $(GNUCOPY) $(SOLARBINDIR)$/mingwm10.dll $(ZIP1DIR) .ELSE @@ -352,7 +352,7 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f) .ENDIF .ENDIF # "$(PACKMS)"!="" .ENDIF #"$(COM)"=="GCC" -.ENDIF +.ENDIF #"$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES" @@ -364,19 +364,14 @@ $(ZIP1DIR)$/%.xcs : %.xcs @@-$(MKDIRHIER) $(@:d) $(GNUCOPY) $< $@ -# Temporary file that is used to replace some placeholders in description.xml. -DESCRIPTION_TMP:=$(ZIP1DIR)$/description.xml.tmp - .INCLUDE .IGNORE : $(ZIP1DIR)_lang_track.mk .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)" PHONYDESC=.PHONY .ENDIF # "$(LAST_WITH_LANG)"!="$(WITH_LANG)" $(DESCRIPTION) $(PHONYDESC) : $$(@:f) @-$(MKDIRHIER) $(@:d) - $(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml registry/LICENSE_xxx $(DESCRIPTION_TMP) @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk - $(TYPE) $(DESCRIPTION_TMP) | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@ - @@-$(RM) $(DESCRIPTION_TMP) + $(TYPE) description.tmp | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@ .ELSE ivo: |