ChangeLogTag: Mon Jan 26 16:57:11 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 11 insertions, 11 deletions

diff --git a/bin/MakeProjectCreator/templates/bor.mpd b/bin/MakeProjectCreator/templates/bor.mpd
index 882a705cd19..8d70e6e3ef0 100644
--- a/bin/MakeProjectCreator/templates/bor.mpd
+++ b/bin/MakeProjectCreator/templates/bor.mpd
@@ -19,7 +19,7 @@ TAO_IDL = <%idl_compiler%>
 
 OBJFILES = \
 <%foreach(source_files)%>
-	$(OBJDIR)\<%basenoextension(source_file)%>.obj<%fornotlast(" \\")%>
+	$(OBJDIR)\<%basenoextension(source_file)%>.$(OBJ_EXT)<%fornotlast(" \\")%>
 <%endfor%>
 <%endif%>
 <%endif%>
diff --git a/include/makeinclude/build_dll.bor b/include/makeinclude/build_dll.bor
index 3430e765aa8..c79e8775747 100644
--- a/include/makeinclude/build_dll.bor
+++ b/include/makeinclude/build_dll.bor
@@ -86,7 +86,7 @@ INSTALL_TYPES =	dll lib	includes
 .path.rc = .
 !endif
 
-.path.obj = $(OBJDIR)
+.path.$(OBJ_EXT) = $(OBJDIR)
 
 !ifdef DEBUG
 !ifndef NO_FULL_PATH
@@ -94,7 +94,7 @@ USE_FULL_PATH = 1
 !endif
 !endif
 
-.cpp.obj:
+.cpp.$(OBJ_EXT):
 	@$(MAKE_OBJDIR)
 !ifdef USE_FULL_PATH
 	@for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=)
@@ -103,7 +103,7 @@ USE_FULL_PATH = 1
 	$(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) $<
 !endif
 
-.c.obj:
+.c.$(OBJ_EXT):
 	@$(MAKE_OBJDIR)
 !ifdef USE_FULL_PATH
 	@for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=)
diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor
index 7a14c20f04b..e64eb9cf4b6 100644
--- a/include/makeinclude/build_exe.bor
+++ b/include/makeinclude/build_exe.bor
@@ -82,7 +82,7 @@ INSTALL_TYPES =	exe
 .path.rc = .
 !endif
 
-.path.obj = $(OBJDIR)
+.path.$(OBJ_EXT) = $(OBJDIR)
 
 !ifdef DEBUG
 !ifndef NO_FULL_PATH
@@ -90,7 +90,7 @@ USE_FULL_PATH = 1
 !endif
 !endif
 
-.cpp.obj:
+.cpp.$(OBJ_EXT):
 	@$(MAKE_OBJDIR)
 !ifdef USE_FULL_PATH
 	@for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=)
@@ -99,7 +99,7 @@ USE_FULL_PATH = 1
 	$(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) $<
 !endif
 
-.c.obj:
+.c.$(OBJ_EXT):
 	@$(MAKE_OBJDIR)
 !ifdef USE_FULL_PATH
 	@for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=)
diff --git a/include/makeinclude/build_lib.bor b/include/makeinclude/build_lib.bor
index 139d868ee5a..bfb5b6489fe 100644
--- a/include/makeinclude/build_lib.bor
+++ b/include/makeinclude/build_lib.bor
@@ -63,7 +63,7 @@ INSTALL_TYPES =	lib includes
 .path.c	= $(CDIR)
 !endif
 
-.path.obj = $(OBJDIR)
+.path.$(OBJ_EXT) = $(OBJDIR)
 
 !ifdef DEBUG
 !ifndef NO_FULL_PATH
@@ -71,7 +71,7 @@ USE_FULL_PATH = 1
 !endif
 !endif
 
-.cpp.obj:
+.cpp.$(OBJ_EXT):
 	@$(MAKE_OBJDIR)
 !ifdef USE_FULL_PATH
 	@for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=)
@@ -80,7 +80,7 @@ USE_FULL_PATH = 1
 	$(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) $<
 !endif
 
-.c.obj:
+.c.$(OBJ_EXT):
 	@$(MAKE_OBJDIR)
 !ifdef USE_FULL_PATH
 	@for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=)
diff --git a/include/makeinclude/clean.bor b/include/makeinclude/clean.bor
index 7cf10faeac1..6016706ec2b 100644
--- a/include/makeinclude/clean.bor
+++ b/include/makeinclude/clean.bor
@@ -6,7 +6,7 @@
 
 clean:
 	@copy &&!
-@del $(OBJFILES:.obj=.obj ^
+@del $(OBJFILES:.$(OBJ_EXT)=.$(OBJ_EXT) ^
 @del ) $(IDLFILES:.idl=C.cpp ^
 @del ) $(IDLFILES:.idl=C.h ^
 @del ) $(IDLFILES:.idl=C.i ^