- Modified Makefiles to fit with moving of Exceptions to Utils

src/Makefile.linux

@@ -4,9 +4,9 @@
 #
 # description : Makefile for DeviceServer
 #
-# $Author: stephpsoleil $
+# $Author: flanglois $
 #
-# $Revision: 1.3 $
+# $Revision: 1.4 $
 #
 # $Log: not supported by cvs2svn $
 # Revision 1.2  2006/01/05 16:51:30  hardion
@@ -41,8 +41,6 @@ PACKAGE_NAME = MechanicalGenericBender
 
 
 
-
-
 #=============================================================================
 # INC_DIR_USER is the list of all include path needed by your sources
 #   - for a device server, tango dependencies are automatically appended
@@ -51,7 +49,11 @@ PACKAGE_NAME = MechanicalGenericBender
 
 SW_SUPPORT=$(SOLEIL_ROOT)/sw-support
 
-INC_DIR_USER=	-I $(SW_SUPPORT)/GenericBender/include -I $(SW_SUPPORT)/GSL/include -I $(SW_SUPPORT)/Monochromator/include -I $(SW_SUPPORT)/Interpolator/include -I $(SW_SUPPORT)/Exceptions/include -I $(SW_SUPPORT)/Utils/include
+INC_DIR_USER=	-I $(SW_SUPPORT)/GenericBender/include \
+				-I $(SW_SUPPORT)/GSL/include\
+				-I $(SW_SUPPORT)/Monochromator/include\
+				-I $(SW_SUPPORT)/Interpolator/include\
+				-I $(SW_SUPPORT)/Utils/include\
 
 
 
@@ -61,7 +63,11 @@ INC_DIR_USER=	-I $(SW_SUPPORT)/GenericBender/include -I $(SW_SUPPORT)/GSL/includ
 #   - '-L ../lib' is automatically appended in all cases
 #
 
-LIB_DIR_USER=	-L $(SW_SUPPORT)/GenericBender/lib -L $(SW_SUPPORT)/Exceptions/lib -L $(SW_SUPPORT)/GSL/lib -L $(SW_SUPPORT)/Interpolator/lib -L $(SW_SUPPORT)/Utils/lib -L $(SW_SUPPORT)/Monochromator/lib   
+LIB_DIR_USER=	-L $(SW_SUPPORT)/GenericBender/lib\
+				-L $(SW_SUPPORT)/GSL/lib \
+				-L $(SW_SUPPORT)/Interpolator/lib \
+				-L $(SW_SUPPORT)/Utils/lib \
+				-L $(SW_SUPPORT)/Monochromator/lib   \
 
 
 
@@ -76,11 +82,11 @@ LIB_DIR_USER=	-L $(SW_SUPPORT)/GenericBender/lib -L $(SW_SUPPORT)/Exceptions/lib
 # you must use '-lA -lB' in this order as link flags, otherwise you will get
 # 'undefined reference' errors
 #
-LFLAGS_USR=	-lGenericBender -lMonochromator -lInterpolator -lExceptions -lUtils -lGSL
-
-
-
-
+LFLAGS_USR=	-lGenericBender \
+			-lMonochromator \
+			-lInterpolator  \
+			-lUtils \
+			-lGSL\
 
 
 #=============================================================================

src/Makefile.vc

@@ -9,7 +9,6 @@ SW_SUPPORT=$(SOLEIL_ROOT)\sw-support
 INCUSER =	/I$(SW_SUPPORT)\GenericBender\include\ \
 		/I$(SW_SUPPORT)\Monochromator\include\ \
 		/I$(SW_SUPPORT)\GSL\include\ \
-		/I$(SW_SUPPORT)\Exceptions\include\ \
 		/I$(SW_SUPPORT)\Interpolator\include\ \
 		/I$(SW_SUPPORT)\Utils\include\
 #
@@ -21,7 +20,6 @@ INCUSER =	/I$(SW_SUPPORT)\GenericBender\include\ \
 !ifdef DEBUG
 !message "Using libraries in Debug..."
 LIBUSER= 	$(SW_SUPPORT)\GenericBender\lib\libGenericBenderd.lib \
-		$(SW_SUPPORT)\Exceptions\lib\libExceptionsd.lib \
 		$(SW_SUPPORT)\Utils\lib\libUtilsd.lib \
 		$(SW_SUPPORT)\GSL\lib\libGSLd.lib \
 		$(SW_SUPPORT)\Interpolator\lib\libInterpolatord.lib \
@@ -29,7 +27,6 @@ LIBUSER= 	$(SW_SUPPORT)\GenericBender\lib\libGenericBenderd.lib \
 !else
 !message "Using libraries in Release..."
 LIBUSER= 	$(SW_SUPPORT)\GenericBender\lib\libGenericBender.lib \
-		$(SW_SUPPORT)\Exceptions\lib\libExceptions.lib \
 		$(SW_SUPPORT)\Interpolator\lib\libInterpolator.lib \
 		$(SW_SUPPORT)\GSL\lib\libGSL.lib \
 		$(SW_SUPPORT)\Utils\lib\libUtils.lib \

src/MakefileDev.linux

@@ -4,9 +4,9 @@
 #
 # description : Makefile for DeviceServer
 #
-# $Author: stephpsoleil $
+# $Author: flanglois $
 #
-# $Revision: 1.4 $
+# $Revision: 1.5 $
 #
 # $Log: not supported by cvs2svn $
 # Revision 1.2  2006/01/05 16:51:30  hardion
@@ -53,7 +53,11 @@ PACKAGE_NAME = MechanicalGenericBender
 # Please create an ENV VARIABLE called: SW_SUPPORT pointing to your library path (Utils,Exceptions...)
 # eg: export SW_SUPPORT=../..
 
-INC_DIR_USER=	-I $(SW_SUPPORT)/GenericBender/include -I $(SW_SUPPORT)/Monochromator/include -I $(SW_SUPPORT)/GSL/include -I $(SW_SUPPORT)/Interpolator/include -I $(SW_SUPPORT)/Exceptions/include -I $(SW_SUPPORT)/Utils/include
+INC_DIR_USER=	-I $(SW_SUPPORT)/GenericBender/include \
+				-I $(SW_SUPPORT)/Monochromator/include \
+				-I $(SW_SUPPORT)/GSL/include \
+				-I $(SW_SUPPORT)/Interpolator/include  \
+				-I $(SW_SUPPORT)/Utils/include\
 
 
 
@@ -63,7 +67,11 @@ INC_DIR_USER=	-I $(SW_SUPPORT)/GenericBender/include -I $(SW_SUPPORT)/Monochroma
 #   - '-L ../lib' is automatically appended in all cases
 #
 
-LIB_DIR_USER=	-L $(SW_SUPPORT)/GenericBender/lib -L $(SW_SUPPORT)/Exceptions/lib -L $(SW_SUPPORT)/GSL/lib -L $(SW_SUPPORT)/Interpolator/lib -L $(SW_SUPPORT)/Utils/lib -L $(SW_SUPPORT)/Monochromator/lib   
+LIB_DIR_USER=	-L $(SW_SUPPORT)/GenericBender/lib  \
+				-L $(SW_SUPPORT)/GSL/lib \
+				-L $(SW_SUPPORT)/Interpolator/lib \
+				-L $(SW_SUPPORT)/Utils/lib \
+				-L $(SW_SUPPORT)/Monochromator/lib   \
 
 
 
@@ -78,10 +86,11 @@ LIB_DIR_USER=	-L $(SW_SUPPORT)/GenericBender/lib -L $(SW_SUPPORT)/Exceptions/lib
 # you must use '-lA -lB' in this order as link flags, otherwise you will get
 # 'undefined reference' errors
 #
-LFLAGS_USR= -g3	-lGenericBender -lMonochromator -lInterpolator -lExceptions -lUtils -lGSL
-
-
-
+LFLAGS_USR= -lGenericBender \
+			-lMonochromator \
+			-lInterpolator  \
+			-lUtils \
+			-lGSL\
 
 
 

src/MakefileDev.vc

@@ -10,7 +10,6 @@ device_server= MechanicalGenericBender
 INCUSER =	/I$(SW_SUPPORT)\GenericBender\include\ \
 		/I$(SW_SUPPORT)\Monochromator\include\ \
 		/I$(SW_SUPPORT)\GSL\include\ \
-		/I$(SW_SUPPORT)\Exceptions\include\ \
 		/I$(SW_SUPPORT)\Interpolator\include\ \
 		/I$(SW_SUPPORT)\Utils\include\ /VERBOSE:LIB
 #
@@ -22,7 +21,6 @@ INCUSER =	/I$(SW_SUPPORT)\GenericBender\include\ \
 !ifdef DEBUG
 !message "Using libraries in Debug..."
 LIBUSER= 	$(SW_SUPPORT)\GenericBender\lib\libGenericBenderd.lib \
-		$(SW_SUPPORT)\Exceptions\lib\libExceptionsd.lib \
 		$(SW_SUPPORT)\Interpolator\lib\libInterpolatord.lib \
 		$(SW_SUPPORT)\Utils\lib\libUtilsd.lib \
 		$(SW_SUPPORT)\GSL\lib\libGSLd.lib \
@@ -30,7 +28,6 @@ LIBUSER= 	$(SW_SUPPORT)\GenericBender\lib\libGenericBenderd.lib \
 !else
 !message "Using libraries in Release..."
 LIBUSER= 	$(SW_SUPPORT)\GenericBender\lib\libGenericBender.lib \
-		$(SW_SUPPORT)\Exceptions\lib\libExceptions.lib \
 		$(SW_SUPPORT)\Interpolator\lib\libInterpolator.lib \
 		$(SW_SUPPORT)\Utils\lib\libUtils.lib \
 		$(SW_SUPPORT)\GSL\lib\libGSL.lib \