diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 10:08:26 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 10:08:26 +0000 |
| commit | 7c8a4006529e0b739733bef7e40d6868ef337c11 (patch) | |
| tree | 7a24e12c79e7acb0b65d7bdb0d75e3bca72b3244 /odk/examples/cpp/complextoolbarcontrols/Makefile | |
| parent | 9f7e9ca9286a4ef903caa38df4843d357373b8af (diff) | |
INTEGRATION: CWS jsc17 (1.3.8); FILE MERGED
2007/01/22 15:35:31 jsc 1.3.8.2: #i73750# change UNOPKG_EXT to UNOOXT_EXT
2007/01/22 13:31:40 jsc 1.3.8.1: #i72793# integrate patch and verify all C++ makefile
Diffstat (limited to 'odk/examples/cpp/complextoolbarcontrols/Makefile')
| -rw-r--r-- | odk/examples/cpp/complextoolbarcontrols/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile b/odk/examples/cpp/complextoolbarcontrols/Makefile index 00e3aa16ae03..802b8a1b2050 100644 --- a/odk/examples/cpp/complextoolbarcontrols/Makefile +++ b/odk/examples/cpp/complextoolbarcontrols/Makefile @@ -2,9 +2,9 @@ # # $RCSfile: Makefile,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: ihi $ $Date: 2006-12-20 12:25:26 $ +# last change: $Author: obo $ $Date: 2007-01-25 11:08:26 $ # # The Contents of this file are made available subject to the terms of # the BSD license. @@ -54,8 +54,8 @@ OUT_COMP_INC=$(OUT_INC)/$(COMPONENT_NAME) OUT_COMP_GEN=$(OUT_MISC)/$(COMPONENT_NAME) OUT_COMP_SLO=$(OUT_SLO)/$(COMPONENT_NAME) COMPONENT_XML=$(COMPONENT_NAME).uno.xml -COMPONENT_PACKAGE = $(OUT_BIN)/$(COMPONENT_NAME).$(UNOPKG_EXT) -COMPONENT_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMPONENT_NAME).$(UNOPKG_EXT)") +COMPONENT_PACKAGE = $(OUT_BIN)/$(COMPONENT_NAME).$(UNOOXT_EXT) +COMPONENT_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMPONENT_NAME).$(UNOOXT_EXT)") COMPONENT_UNOPKG_MANIFEST = $(OUT_COMP_GEN)/$(COMPONENT_NAME)/META-INF/manifest.xml REGISTERFLAG = $(OUT_MISC)/cpp_$(COMPONENT_NAME)_register_component.flag @@ -103,7 +103,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) - $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $^\ + $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $^ \ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) endif @@ -132,7 +132,7 @@ $(COMPONENT_PACKAGE) : $(SHAREDLIB_OUT)/$(COMPONENT_IMPL_NAME) Addons.xcu Protoc $(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM)) cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) ../../bin/$(@F) $(UNOPKG_PLATFORM)/$(<F) $(SDK_ZIP) -u $@ Addons.xcu ProtocolHandler.xcu WriterWindowState.xcu CalcWindowState.xcu logo_small.png logo_big.png - cd $(subst /,$(PS),$(OUT_COMP_GEN)/$(subst .$(UNOPKG_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml + cd $(subst /,$(PS),$(OUT_COMP_GEN)/$(subst .$(UNOOXT_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml $(REGISTERFLAG) : $(COMPONENT_PACKAGE) ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES" |