summaryrefslogtreecommitdiff
path: root/odk/examples/cpp
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-06-10 09:46:09 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-06-10 09:46:09 +0000
commit56ad7948412b023ea133a54a082ec97c2e6b3af3 (patch)
treef7dd023e231724f33c416a04e8cd07f2d0c7d67e /odk/examples/cpp
parent6ed38299b47bff174eafa28bc0a758f0824b7844 (diff)
INTEGRATION: CWS sdk02 (1.4.10); FILE MERGED
2003/05/16 14:01:30 jsc 1.4.10.1: #109045# improve build process
Diffstat (limited to 'odk/examples/cpp')
-rw-r--r--odk/examples/cpp/remoteclient/Makefile29
1 files changed, 15 insertions, 14 deletions
diff --git a/odk/examples/cpp/remoteclient/Makefile b/odk/examples/cpp/remoteclient/Makefile
index b22b8ed7f1c4..a2dae227f803 100644
--- a/odk/examples/cpp/remoteclient/Makefile
+++ b/odk/examples/cpp/remoteclient/Makefile
@@ -36,44 +36,45 @@ ALL : \
include $(SETTINGS)/stdtarget.mk
-# create all component sepcific output directories
-# and use OUT_COMP_GEN for dependencies
-$(OUT_COMP_GEN) : $(OUT)
- $(MKDIR) $(subst /,$(PS),$@)
- $(MKDIR) $(subst /,$(PS),$(OUT_COMP_INC))
- $(MKDIR) $(subst /,$(PS),$(OUT_COMP_SLO))
-
# This example type library will be extended by the office types
-$(OUT_BIN)/%.rdb : $(OUT_COMP_GEN)
+$(OUT_BIN)/%.rdb :
+ -$(MKDIR) $(subst /,$(PS),$(@D))
-$(DEL) $(subst /,$(PS),$@)
regmerge $@ / $(DKREGISTRYNAME)
-$(COMPONENT_TYPEFLAG) : $(COMPONENT_RDB) $(COMPONENT_XML) $(OUT_COMP_GEN)
+$(COMPONENT_TYPEFLAG) : $(COMPONENT_RDB) $(COMPONENT_XML)
+ -$(MKDIR) $(subst /,$(PS),$(@D))
-$(DEL) $(subst /,$(PS),$(COMPONENT_TYPEFLAG))
cppumaker -Gc -BUCR -O$(OUT_COMP_INC) $(TYPESLIST) $(COMPONENT_RDB)
echo flagged > $@
-$(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(COMPONENT_TYPEFLAG) $(OUT_COMP_GEN)
+$(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(COMPONENT_TYPEFLAG)
+ -$(MKDIR) $(subst /,$(PS),$(@D))
$(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
-$(OUT_COMP_GEN)/%.def : exports.dxp $(OUT_COMP_GEN)
+$(OUT_COMP_GEN)/%.def : exports.dxp
ifeq "$(OS)" "WIN"
+ -$(MKDIR) $(subst /,$(PS),$(@D))
@echo EXPORTS > $@
$(CAT) exports.dxp >> $@
endif
ifeq "$(OS)" "WIN"
-$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(OUT_COMP_GEN)/$(COMPONENT_NAME).def $(OUT_COMP_GEN)
- $(LINK) $(LIBRARY_LINK_FLAGS) /OUT:$@ /MAP:$(OUT_COMP_GEN)/$(COMPONENT_NAME).map \
- /DEF:$(OUT_COMP_GEN)/$(COMPONENT_NAME).def $(SLOFILES) \
+$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(OUT_COMP_GEN)/%.def
+ -$(MKDIR) $(subst /,$(PS),$(@D))
+ -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
+ $(LINK) $(LIBRARY_LINK_FLAGS) /OUT:$@ /MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) \
+ /DEF:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),def,$(@F)) $(SLOFILES) \
$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
else
$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
+ -$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(LIBRARY_LINK_FLAGS) $(LINK_LIBS) -o $@ $^\
$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB)
endif
$(COMPOENNT_ENV_FLAG) : $(COMPONENT_RDB) $(OUT_BIN)/remoteserver.rdb
+ -$(MKDIR) $(subst /,$(PS),$(@D))
-$(DEL) $@
@echo --------------------------------------------------------------------------------
@echo Register necessary runtime components in remoteserver/remoteclientsample rdb