Index: DataqSDK/Makefile =================================================================== RCS file: /export/storage/cvs/src/dataqsdk/DataqSDK/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- DataqSDK/Makefile 4 Mar 2006 17:40:27 -0000 1.1.1.1 +++ DataqSDK/Makefile 4 Mar 2006 17:55:21 -0000 1.2 @@ -33,7 +33,8 @@ $(TEMP_OBJ_FILES) INS_PATH = /usr/local/lib/ -default : $(OBJ_FILES) +default : shared static + shared : $(OBJ_FILES) g++ -shared -Wl,-soname,libdataqsdk.so.0 -o libdataqsdk.so.0.0 \ $(OBJ_FILES) @@ -52,7 +53,7 @@ di154/di154.o : di154/di154.h di154/di154.cpp di194/di194.o di194/di194_commands.o di_serial_io/di_serial_io.o $(CC) $(CFLAGS) di154/di154.o di154/di154.cpp clean : - rm -f dataqsdk.o libdataqsdk.* + rm -f dataqsdk.o libdataqsdk.* */*.o clean-all : rm -f libdataqsdk.* rm -f $(OBJ_FILES) Index: DataqSDK/constants.h =================================================================== RCS file: /export/storage/cvs/src/dataqsdk/DataqSDK/constants.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- DataqSDK/constants.h 4 Mar 2006 17:40:27 -0000 1.1.1.1 +++ DataqSDK/constants.h 4 Mar 2006 17:54:48 -0000 1.2 @@ -123,6 +123,12 @@ */ const int EBOUNDS = 200; ///< Argument out of bounds. const int EBADRSVP = 201; ///< Device isn't responding properly. +#ifndef ENODATA +const int ENODATA = 202; ///< No data available +#endif +#ifndef ENOLINK +const int ENOLINK = 203; ///< Data link is down. +#endif /** @} */ #endif Index: dataqsdk_example/Makefile =================================================================== RCS file: /export/storage/cvs/src/dataqsdk/dataqsdk_example/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- dataqsdk_example/Makefile 4 Mar 2006 17:40:27 -0000 1.1.1.1 +++ dataqsdk_example/Makefile 4 Mar 2006 18:15:09 -0000 1.2 @@ -1,12 +1,17 @@ -CC = g++ +CC = g++ -I../DataqSDK -L../DataqSDK + CFLAGS = -Wall -c +default: shared-example static-example + # using shared library, no libdataqsdk.a around -shared-example : main.o /usr/local/lib/libdataqsdk.so.0.0 +shared-example : main.o $(CC) -Wall -o shared-example main.o -ldataqsdk + # using static library, no libdataqsdk.so... installed -static-example : main.o libdataqsdk.a - $(CC) -Wall -o static-example main.o -L. -ldataqsdk +static-example : main.o + $(CC) -Wall -o static-example main.o -ldataqsdk -static + main.o : main.cpp $(CC) $(CFLAGS) main.cpp clean :