INTEGRATION: CWS sdk01 (1.1.4.1.6); FILE MERGED

2003/04/12 10:13:52 jsc 1.1.4.1.6.2: #108799# new naming convention
2003/04/10 11:34:35 jsc 1.1.4.1.6.1: #108799# use new naming convention for uno components

odk/examples/cpp/remoteclient/Makefile

@@ -9,11 +9,11 @@ include $(SETTINGS)/dk.mk
 
 # Define non-platform/compiler specific settings
 COMPONENT_NAME=remoteclientsample
-COMPONENT_IMPL_NAME=$(SHAREDLIB_PRE)$(COMPONENT_NAME).$(SHAREDLIB_EXT) 
-COMPONENT_IMPL=$(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)$(COMPONENT_NAME).$(SHAREDLIB_EXT) 
-COMPONENT_RDB_NAME = $(COMPONENT_NAME).rdb
+COMPONENT_IMPL_NAME=$(COMPONENT_NAME).uno.$(SHAREDLIB_EXT) 
+COMPONENT_IMPL=$(SHAREDLIB_OUT)/$(COMPONENT_IMPL_NAME)
+COMPONENT_RDB_NAME = $(COMPONENT_NAME).uno.rdb
 COMPONENT_RDB = $(OUT_BIN)/$(COMPONENT_RDB_NAME)
-COMPONENT_XML=$(COMPONENT_NAME).xml
+COMPONENT_XML=$(COMPONENT_NAME).uno.xml
 
 OUT_COMP_INC=$(OUT_INC)/$(COMPONENT_NAME)
 OUT_COMP_GEN=$(OUT_MISC)/$(COMPONENT_NAME)
@@ -63,12 +63,12 @@ ifeq "$(OS)" "WIN"
 endif
 
 ifeq "$(OS)" "WIN"
-$(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)%.$(SHAREDLIB_EXT) : $(SLOFILES) $(OUT_COMP_GEN)/$(COMPONENT_NAME).def $(OUT_COMP_GEN)
+$(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) \
 	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
 else
-$(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)%.$(SHAREDLIB_EXT) : $(SLOFILES)
+$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	$(LINK) $(LIBRARY_LINK_FLAGS) $(LINK_LIBS) -o $@ $^\
 	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB)
 endif	
@@ -126,5 +126,5 @@ clean :
 	-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_COMP_GEN))
 	-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_COMP_SLO))
 	-$(DEL) $(subst /,$(PS),$(COMPONENT_TYPEFLAG))
-	-$(DEL) $(subst /,$(PS),$(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)$(COMPONENT_NAME).*)
+	-$(DEL) $(subst /,$(PS),$(SHAREDLIB_OUT)/$(COMPONENT_NAME).*)
 	-$(DEL) $(subst /,$(PS),$(OUT_BIN)/remoteserver.rdb)