[Emc-commit] emc2/src Makefile,1.104,1.105 configure,1.51,1.52 configure.in,1.55,1.56

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Modified file emc2/src/Makefile

Full file:
<http://cvs.linuxcnc.org/cvs/emc2/src/Makefile?rev=1.105>

Difference:
<http://cvs.linuxcnc.org/cvs/emc2/src/Makefile.diff?r1=1.104;r2=1.105>

Branch: HEAD

Log:
revision 1.105
date: 2006/05/29 02:27:06;  author: jepler;  state: Exp;  lines: +34 -31
first stab at making MATHLIB and MATHSTUB work again

--- Makefile	2006/05/26 20:08:13	1.104
+++ Makefile	2006/05/29 02:27:06	1.105
@@ -387,6 +387,9 @@
 	-I$(BASEPWD)/libnml/posemath -I$(BASEPWD)/rtapi -I$(BASEPWD)/hal \
 	-I$(BASEPWD)/emc/nml_intf -I$(BASEPWD)/emc/kinematics -I$(BASEPWD)/emc/motion
 
+ifeq "$(USE_STUBS)" "1"
+MATHSTUB := rtapi/matstubs.o
+endif
 
 ifdef SEQUENTIAL_SUPPORT
 EXTRA_CFLAGS += -DSEQUENTIAL_SUPPORT
@@ -406,62 +409,62 @@
 
 # Subdirectory: hal/components
 obj-$(CONFIG_BLOCKS) += blocks.o
-blocks-objs := hal/components/blocks.o
+blocks-objs := hal/components/blocks.o $(MATHSTUB)
 obj-$(CONFIG_DEBOUNCE) += debounce.o
-debounce-objs := hal/components/debounce.o
+debounce-objs := hal/components/debounce.o $(MATHSTUB)
 obj-$(CONFIG_ENCODER) += encoder.o
-encoder-objs := hal/components/encoder.o
-obj-$(CONFIG_COUNTER) += counter.o
+encoder-objs := hal/components/encoder.o $(MATHSTUB)
+obj-$(CONFIG_COUNTER) += counter.o $(MATHSTUB)
 counter-objs := hal/components/counter.o
-obj-$(CONFIG_ENCODER_RATIO) += encoder_ratio.o
+obj-$(CONFIG_ENCODER_RATIO) += encoder_ratio.o $(MATHSTUB)
 encoder_ratio-objs := hal/components/encoder_ratio.o
-obj-$(CONFIG_STEPGEN) += stepgen.o
+obj-$(CONFIG_STEPGEN) += stepgen.o $(MATHSTUB)
 stepgen-objs := hal/components/stepgen.o
-obj-$(CONFIG_FREQGEN) += freqgen.o
+obj-$(CONFIG_FREQGEN) += freqgen.o $(MATHSTUB)
 freqgen-objs := hal/components/freqgen.o
-obj-$(CONFIG_SIGGEN) += siggen.o
+obj-$(CONFIG_SIGGEN) += siggen.o $(MATHSTUB)
 siggen-objs := hal/components/siggen.o
-obj-$(CONFIG_PID) += pid.o
+obj-$(CONFIG_PID) += pid.o $(MATHSTUB)
 pid-objs := hal/components/pid.o
-obj-$(CONFIG_PID) += threads.o
+obj-$(CONFIG_PID) += threads.o $(MATHSTUB)
 threads-objs := hal/components/threads.o
-obj-$(CONFIG_SUPPLY) += supply.o
+obj-$(CONFIG_SUPPLY) += supply.o $(MATHSTUB)
 supply-objs := hal/components/supply.o
-obj-$(CONFIG_TIMEDELAY) += timedelay.o
+obj-$(CONFIG_TIMEDELAY) += timedelay.o $(MATHSTUB)
 timedelay-objs := hal/components/timedelay.o
-obj-$(CONFIG_SIM_ENCODER) += sim_encoder.o
+obj-$(CONFIG_SIM_ENCODER) += sim_encoder.o $(MATHSTUB)
 sim_encoder-objs := hal/components/sim_encoder.o
-obj-$(CONFIG_WEIGHTED_SUM) += weighted_sum.o
+obj-$(CONFIG_WEIGHTED_SUM) += weighted_sum.o $(MATHSTUB)
 weighted_sum-objs := hal/components/weighted_sum.o
-obj-$(CONFIG_MODMATH) += modmath.o
+obj-$(CONFIG_MODMATH) += modmath.o $(MATHSTUB)
 modmath-objs := hal/components/modmath.o
 
 # Subdirectory: hal/drivers
-obj-$(CONFIG_HAL_PARPORT) += hal_parport.o
+obj-$(CONFIG_HAL_PARPORT) += hal_parport.o $(MATHSTUB)
 hal_parport-objs := hal/drivers/hal_parport.o
-obj-$(CONFIG_HAL_TIRO) += hal_tiro.o
+obj-$(CONFIG_HAL_TIRO) += hal_tiro.o $(MATHSTUB)
 hal_tiro-objs := hal/drivers/hal_tiro.o
-obj-$(CONFIG_HAL_STG) += hal_stg.o
+obj-$(CONFIG_HAL_STG) += hal_stg.o $(MATHSTUB)
 hal_stg-objs := hal/drivers/hal_stg.o
-obj-$(CONFIG_HAL_VTI) += hal_vti.o
+obj-$(CONFIG_HAL_VTI) += hal_vti.o $(MATHSTUB)
 hal_vti-objs := hal/drivers/hal_vti.o
-obj-$(CONFIG_HAL_EVOREG) += hal_evoreg.o
+obj-$(CONFIG_HAL_EVOREG) += hal_evoreg.o $(MATHSTUB)
 hal_evoreg-objs := hal/drivers/hal_evoreg.o
-obj-$(CONFIG_HAL_MOTENC) += hal_motenc.o
+obj-$(CONFIG_HAL_MOTENC) += hal_motenc.o $(MATHSTUB)
 hal_motenc-objs := hal/drivers/hal_motenc.o
-obj-$(CONFIG_HAL_M5I20) += hal_m5i20.o
+obj-$(CONFIG_HAL_M5I20) += hal_m5i20.o $(MATHSTUB)
 hal_m5i20-objs := hal/drivers/hal_m5i20.o
-obj-$(CONFIG_HAL_AX521H) += hal_ax5214h.o
+obj-$(CONFIG_HAL_AX521H) += hal_ax5214h.o $(MATHSTUB)
 hal_ax5214h-objs := hal/drivers/hal_ax5214h.o
-obj-$(CONFIG_HAL_PPMC) += hal_ppmc.o
+obj-$(CONFIG_HAL_PPMC) += hal_ppmc.o $(MATHSTUB)
 hal_ppmc-objs := hal/drivers/hal_ppmc.o
-obj-$(CONFIG_HAL_SKELETON) += hal_speaker.o
+obj-$(CONFIG_HAL_SKELETON) += hal_speaker.o $(MATHSTUB)
 hal_speaker-objs := hal/drivers/hal_speaker.o
-obj-$(CONFIG_HAL_SKELETON) += hal_skeleton.o
+obj-$(CONFIG_HAL_SKELETON) += hal_skeleton.o $(MATHSTUB)
 hal_skeleton-objs := hal/drivers/hal_skeleton.o
 
 obj-$(CONFIG_CLASSICLADDER_RT) += classicladder_rt.o

Modified file emc2/src/configure

Full file:
<http://cvs.linuxcnc.org/cvs/emc2/src/configure?rev=1.52>

Difference:
<http://cvs.linuxcnc.org/cvs/emc2/src/configure.diff?r1=1.51;r2=1.52>

Branch: HEAD

Log:
revision 1.52
date: 2006/05/29 02:27:06;  author: jepler;  state: Exp;  lines: +1 -1
first stab at making MATHLIB and MATHSTUB work again

--- configure	2006/05/25 00:02:23	1.51
+++ configure	2006/05/29 02:27:06	1.52
@@ -4550,7 +4550,7 @@
 			please file a bug report." >&2;}
             USE_LIBM=1
 	    USE_STUBS=1
-            MATHLIB="\$(RTTMP_DIR)/mathstubs.o -L/usr/lib -lm"
+            MATHLIB="-L/usr/lib -lm"
         fi
     fi
     rm -f tests/mathtest.o tests/mathtest 2>/dev/null

Modified file emc2/src/configure.in

Full file:
<http://cvs.linuxcnc.org/cvs/emc2/src/configure.in?rev=1.56>

Difference:
<http://cvs.linuxcnc.org/cvs/emc2/src/configure.in.diff?r1=1.55;r2=1.56>

Branch: HEAD

Log:
revision 1.56
date: 2006/05/29 02:27:07;  author: jepler;  state: Exp;  lines: +7 -7
first stab at making MATHLIB and MATHSTUB work again

--- configure.in	2006/05/25 00:02:23	1.55
+++ configure.in	2006/05/29 02:27:07	1.56
@@ -13,9 +13,9 @@
 # Copyright (c) 2004 All rights reserved.
 #
 # Last change:
-# $Revision: 1.55 $
+# $Revision: 1.56 $
 # $Author: jepler $
-# $Date: 2006/05/25 00:02:23 $
+# $Date: 2006/05/29 02:27:07 $
 # This file is released under GPL, refer to docs/README for details
 #
 # This file is adapted to replace the old ./configure script
@@ -818,7 +818,7 @@
 			please file a bug report.])
             USE_LIBM=1
 	    USE_STUBS=1
-            MATHLIB="\$(RTTMP_DIR)/mathstubs.o -L/usr/lib -lm"
+            MATHLIB="-L/usr/lib -lm"
         fi
     fi
     rm -f tests/mathtest.o tests/mathtest 2>/dev/null
@@ -860,9 +860,9 @@
 * Copyright (c) 2004 All rights reserved.
 *
 * Last change: 
-* $Revision: 1.55 $
+* $Revision: 1.56 $
 * $Author: jepler $
-* $Date: 2006/05/25 00:02:23 $
+* $Date: 2006/05/29 02:27:07 $
 ********************************************************************/
 #ifndef EMC2_CONFIG_H
 #define EMC2_CONFIG_H



