[Bf-committers] Second try, stop relinking for the ODE library

[Gilles J. Seguin]

This is a multi-part message in MIME format.
--------------2EF54069623DADCB89342FE7
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

 
--------------2EF54069623DADCB89342FE7
Content-Type: text/plain; charset=us-ascii;
 name="check04.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="check04.diff"

Index: blender/source/ode/Makefile
===================================================================
RCS file: /cvs01/blender/source/ode/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	2002/11/04 21:55:48	1.2
+++ Makefile	2002/12/14 04:50:22
@@ -158,8 +158,10 @@
 # remember: when we evaluate these variables later, this causes the creation
 # of the appropriate list file.
 ifeq ($(WINDOWS16),1)
-SIDE_EFFECT_ODE_OBJLIST = $(foreach o,$(ODE_OBJECTS),$(shell echo $(o) >> odeobj.txt ))
-SIDE_EFFECT_DRAWSTUFF_OBJLIST = $(foreach o,$(DRAWSTUFF_OBJECTS),$(shell echo $(o) >> dsobj.txt ))
+SIDE_EFFECT_ODE_OBJLIST = \
+  $(foreach o,$(ODE_OBJECTS),$(shell echo $(o) >> odeobj.txt ))
+SIDE_EFFECT_DRAWSTUFF_OBJLIST = \
+  $(foreach o,$(DRAWSTUFF_OBJECTS),$(shell echo $(o) >> dsobj.txt ))
 endif
 
 # library file names
@@ -194,8 +196,8 @@
 ODE_LIB_AR_RULE=$(AR)$@
 endif
 
-$(ODE_LIB): pre_ode_lib $(ODE_OBJECTS)
 ifeq ($(WINDOWS16),1)
+$(ODE_LIB): pre_ode_lib $(ODE_OBJECTS)
 #   if we have a command-line-length limitation, then dynamically create
 #   a file containing all object filenames, and pass this file to the linker
 #   instead of directly specifying the object filenames on the command line.
@@ -204,6 +206,7 @@
 	$(SIDE_EFFECT_ODE_OBJLIST)
 	$(ODE_LIB_AR_RULE) @odeobj.txt
 else
+$(ODE_LIB): $(ODE_OBJECTS)
 #   if we have no command-line-length limitation, directly specify all
 #   object files to be linked.
 	$(ODE_LIB_AR_RULE) $(ODE_OBJECTS)
@@ -213,12 +216,13 @@
 	$(RANLIB) $@
 endif
 
-$(DRAWSTUFF_LIB): pre_drawstuff_lib $(DRAWSTUFF_OBJECTS)
 ifeq ($WINDOWS16),1)
+$(DRAWSTUFF_LIB): pre_drawstuff_lib $(DRAWSTUFF_OBJECTS)
 #   if we have a command-line-length limitation, then do the same as above.
 	$(SIDE_EFFECT_DRAWSTUFF_OBJLIST)
 	$(AR)$@ @dsobj.txt
 else
+$(DRAWSTUFF_LIB): $(DRAWSTUFF_OBJECTS)
 #   if we have no command-line-length limitation, directly specify all object
 #   files to be linked.
 	$(AR)$@ $(DRAWSTUFF_OBJECTS)
@@ -227,7 +231,8 @@
 	$(RANLIB) $@
 endif
 
-# rules to be executed before library linking starts: delete list file (if one is used)
+# rules to be executed before library linking starts:
+#   delete list file (if one is used)
 
 pre_ode_lib:
 ifeq ($WINDOWS16),1)
@@ -240,7 +245,10 @@
 endif
 
 clean:
-	-$(DEL_CMD) $(ODE_OBJECTS) $(ODE_TEST_EXE) $(ODE_LIB) $(DRAWSTUFF_OBJECTS) $(DRAWSTUFF_TEST_EXE) $(DRAWSTUFF_LIB) ode/test/*$(OBJ) drawstuff/dstest/*$(OBJ) $(CONFIGURATOR_EXE) $(CONFIG_H)
+	-$(DEL_CMD) $(ODE_OBJECTS) $(ODE_TEST_EXE) $(ODE_LIB) \
+	  $(DRAWSTUFF_OBJECTS) $(DRAWSTUFF_TEST_EXE) $(DRAWSTUFF_LIB) \
+	  ode/test/*$(OBJ) drawstuff/dstest/*$(OBJ) $(CONFIGURATOR_EXE) \
+	  $(CONFIG_H)
 
 %$(OBJ): %.c
 	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
@@ -249,7 +257,8 @@
 	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $<
 
 %.exe: %$(OBJ)
-	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH)
+	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) \
+	  $(LINK_OPENGL) $(LINK_MATH)
 
 # windows specific rules
 
@@ -262,7 +271,8 @@
 configure: $(CONFIG_H)
 
 $(CONFIG_H): $(CONFIGURATOR_EXE) $(USER_SETTINGS) $(PLATFORM_MAKEFILE)
-	$(THIS_DIR)$(CONFIGURATOR_EXE) $(CONFIG_H) "$(CC) $(DEFINES) $(C_EXEOUT)" "$(DEL_CMD)" $(THIS_DIR)
+	$(THIS_DIR)$(CONFIGURATOR_EXE) $(CONFIG_H) "$(CC) $(DEFINES) \
+	  $(C_EXEOUT)" "$(DEL_CMD)" $(THIS_DIR)
 
 $(CONFIGURATOR_EXE): $(CONFIGURATOR_SRC) $(USER_SETTINGS) $(PLATFORM_MAKEFILE)
 	$(CC) $(C_DEF)d$(PRECISION) $(DEFINES) $(C_EXEOUT)$@ $<
@@ -271,10 +281,15 @@
 # unix-gcc specific dependency making
 
 DEP_RULE=gcc -M $(C_INC)$(INCPATH) $(DEFINES)
-depend: $(ODE_SRC) $(ODE_PREGEN_SRC) $(DRAWSTUFF_SRC) $(ODE_TEST_SRC_CPP) $(ODE_TEST_SRC_C) $(DRAWSTUFF_TEST_SRC_CPP)
-	$(DEP_RULE) $(ODE_SRC) $(ODE_PREGEN_SRC) | tools/process_deps ode/src/ > Makefile.deps
-	$(DEP_RULE) $(DRAWSTUFF_SRC) | tools/process_deps drawstuff/src/ >> Makefile.deps
-	$(DEP_RULE) $(ODE_TEST_SRC_CPP) | tools/process_deps ode/test/ >> Makefile.deps
-	$(DEP_RULE) $(DRAWSTUFF_TEST_SRC_CPP) | tools/process_deps drawstuff/dstest/ >> Makefile.deps
+depend: $(ODE_SRC) $(ODE_PREGEN_SRC) $(DRAWSTUFF_SRC) $(ODE_TEST_SRC_CPP) \
+  $(ODE_TEST_SRC_C) $(DRAWSTUFF_TEST_SRC_CPP)
+	$(DEP_RULE) $(ODE_SRC) $(ODE_PREGEN_SRC) \
+	  | tools/process_deps ode/src/ > Makefile.deps
+	$(DEP_RULE) $(DRAWSTUFF_SRC) \
+	  | tools/process_deps drawstuff/src/ >> Makefile.deps
+	$(DEP_RULE) $(ODE_TEST_SRC_CPP) \
+	  | tools/process_deps ode/test/ >> Makefile.deps
+	$(DEP_RULE) $(DRAWSTUFF_TEST_SRC_CPP) \
+	  | tools/process_deps drawstuff/dstest/ >> Makefile.deps
 
 include Makefile.deps

--------------2EF54069623DADCB89342FE7--