[Bf-committers] [PATCH]blender/source/ode/Makefile

[Gilles J. Seguin]

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

	- blender/source/ode/Makefile: remove prerequisite that have themselves
	  no prerequisite(means they are fired) for linux build.  Stop relink
	  of archive that obliged other relinks.

Also note that previous patch, from 1.1 to 1.2, is doing nothing.
--------------DF4AF81C9BE2A3CA6529F14F
Content-Type: text/plain; charset=us-ascii;
 name="ode-makefile.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="ode-makefile.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/04 08:14:53
@@ -194,8 +194,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 +204,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 +214,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)

--------------DF4AF81C9BE2A3CA6529F14F--