diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 08:18:04 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 08:18:04 +0000 |
| commit | 8ba855927f2cfe6b7c27968cd4a5bcd063eb6b12 (patch) | |
| tree | 9153e33be88d7ae7d9db1edba6ee5556cbbf83d9 | |
| parent | abde10cc437980ac6ac26cc97acac339ade18480 (diff) | |
INTEGRATION: CWS extensionupdate01 (1.6.12); FILE MERGED
2008/07/01 09:54:58 ka 1.6.12.1: #157193#: updated extensions
| -rw-r--r-- | sdext/source/presenter/makefile.mk | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index f7e11011bbe6..8455699ab4d1 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -1,14 +1,14 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # # This file is part of OpenOffice.org. # @@ -240,14 +240,17 @@ COMPONENT_MANIFEST= \ COMPONENT_LIBRARY= \ $(ZIP1DIR)$/$(TARGET).uno$(DLLPOST) +COMPONENT_HELP= \ + $(ZIP1DIR)$/help/component.txt + ZIP1DEPS= \ $(PACKLICS) \ $(DESCRIPTION) \ $(COMPONENT_MANIFEST) \ $(COMPONENT_FILES) \ $(COMPONENT_BITMAPS) \ - $(COMPONENT_LIBRARY) - + $(COMPONENT_LIBRARY) \ + $(COMPONENT_HELP) PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l) @@ -265,6 +268,10 @@ $(COMPONENT_MANIFEST) : $$(@:f) @-$(MKDIRHIER) $(@:d) +$(TYPE) $< | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" > $@ +$(COMPONENT_HELP) : help$/$$(@:f) + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + #$(COMPONENT_FILES) : $$(@:f) # @-$(MKDIRHIER) $(@:d) # +$(COPY) $< $@ @@ -305,7 +312,7 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f) $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC90.CRT.manifest $(ZIP1DIR) .ENDIF .ENDIF # "$(PACKMS)"!="" - .ENDIF #"$(COM)"=="GCC" + .ENDIF #"$(COM)"=="GCC" .ENDIF @@ -339,7 +346,7 @@ $(DESCRIPTION) $(PHONYDESC) : $$(@:f) $(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) + @@-$(RM) $(DESCRIPTION_TMP) .ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO" |