diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-16 23:28:59 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-19 14:15:39 +0100 |
commit | 2633b249ea6921645c57ab24a1c9ad0c8e61e144 (patch) | |
tree | 6e7654e12e78104086e1345c54e832c7f7ed65bb /odk/examples/DevelopersGuide/OfficeDev | |
parent | 5f92d07b80c4a73ebbf9e3e9ddfdf771a676c4ba (diff) |
odk: do not pack unused component.map file
Change-Id: I768acf83234eec46c0271dad2e5bef3bd3cba3cf
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'odk/examples/DevelopersGuide/OfficeDev')
-rw-r--r-- | odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile | 8 | ||||
-rw-r--r-- | odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile index d9f70b2cf36e..c63e960945f9 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile @@ -53,7 +53,6 @@ COMP_PACKAGE = $(OUT_BIN)/$(COMP_NAME).$(UNOOXT_EXT) COMP_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_EXT)") COMP_UNOPKG_MANIFEST = $(OUT_COMP_GEN)/$(COMP_NAME)/META-INF/manifest.xml COMP_COMPONENTS = $(OUT_COMP_GEN)/$(COMP_NAME).components -#COMP_MAPFILE = $(OUT_COMP_GEN)/$(COMP_NAME).uno.map REGISTERFLAG = $(OUT_MISC)/devguide_$(COMP_NAME)_register_component.flag @@ -73,13 +72,6 @@ $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG) -$(MKDIR) $(subst /,$(PS),$(@D)) $(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $< -#$(COMP_MAPFILE) : $(SLOFILES) -# -$(MKDIR) $(subst /,$(PS),$(@D)) -# cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE) -#ifeq "$(OS)" "MACOSX" -# nm -gx $(SLOFILES) | $(ADDSYMBOLS) >> $(COMP_MAPFILE) -#endif - ifeq "$(OS)" "WIN" $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile index 1a9680825e68..f3e780108443 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile @@ -50,7 +50,6 @@ OUT_COMP_SLO=$(OUT_SLO)/$(COMP_NAME) COMP_PACKAGE = $(OUT_BIN)/$(COMP_NAME).$(UNOOXT_EXT) COMP_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_EXT)") COMP_UNOPKG_MANIFEST = $(OUT_COMP_GEN)/$(COMP_NAME)/META-INF/manifest.xml -#COMP_MAPFILE = $(OUT_COMP_GEN)/$(COMP_NAME).uno.map COMP_COMPONENTS = $(OUT_COMP_GEN)/$(COMP_NAME).components COMP_REGISTERFLAG = $(OUT_MISC)/devguide_$(COMP_NAME)_register_component.flag @@ -70,13 +69,6 @@ $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG) -$(MKDIR) $(subst /,$(PS),$(@D)) $(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $< -#$(COMP_MAPFILE) : $(SLOFILES) -# -$(MKDIR) $(subst /,$(PS),$(@D)) -# cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE) -#ifeq "$(OS)" "MACOSX" -# nm -gx $(SLOFILES) | $(ADDSYMBOLS) >> $(COMP_MAPFILE) -#endif - ifeq "$(OS)" "WIN" $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) |