Index: /trunk/clock_and_orbit/makefile
===================================================================
--- /trunk/clock_and_orbit/makefile	(revision 6553)
+++ /trunk/clock_and_orbit/makefile	(revision 6554)
@@ -1,35 +1,36 @@
 all: readco readVtec readRTCM3
-CC       = gcc
-CXX      = g++
-DEFINES  = -DNO_RTCM3_MAIN
-CFLAGS   = -ggdb  $(DEFINES)
-CXXFLAGS = -ggdb  $(DEFINES)
+CC         = gcc
+CXX        = g++
+DEFINES    = -DNO_RTCM3_MAIN
+CFLAGS     = -ggdb -Wall $(DEFINES) -I lib
+CFLAGSR    = $(CFLAGS) -I ../rtcm3torinex/lib/ -DNO_RTCM3_MAIN
+LFLAGS     = -ggdb -lm
+CXXFLAGS   = -ggdb -Wall $(DEFINES) -I lib
+CXXFLAGSR  = $(CXXFLAGS) -I ../rtcm3torinex/lib/
+CXXFLAGSRL = $(CXXFLAGSR) -lm
 
 clock_orbit_rtcm.o: lib/clock_orbit_rtcm.c
-	$(CC) -c $(CFLAGS) -o $@ $< -I lib
+	$(CC) -c $(CFLAGS) -o $@ $<
 
-rtcm3torinex.o: lib/rtcm3torinex.c
-	$(CC) -c $(CFLAGS) -o $@ $< -I lib  
-
+rtcm3torinex.o: ../rtcm3torinex/lib/rtcm3torinex.c
+	$(CC) -c $(CFLAGSR) -o $@ $<
 
 readco.o: readco.c clock_orbit_rtcm.o
-	$(CC) -c $(CFLAGS) $< -I lib
+	$(CC) -c $(CFLAGS) -o $@ $<
 
 readVtec.o: readVtec.c
-	$(CC) -c $(CFLAGS) $< -I lib
+	$(CC) -c $(CFLAGS) -o $@ $<
 
 readRTCM3.o: readRTCM3.cpp
-	$(CXX) -c $(CXXFLAGS) $< -I lib
-	
+	$(CXX) -c $(CXXFLAGSR) $< -I lib
 
 readco: readco.o clock_orbit_rtcm.o
-	$(CC) $(CFLAGS) -lm -o $@ readco.o clock_orbit_rtcm.o
+	$(CC) $(LFLAGS) -o $@ readco.o clock_orbit_rtcm.o
 
 readVtec: readVtec.o clock_orbit_rtcm.o
-	$(CC) $(CFLAGS) -lm -o $@ readVtec.o clock_orbit_rtcm.o
+	$(CC) $(LFLAGS) -o $@ readVtec.o clock_orbit_rtcm.o
 
 readRTCM3: readRTCM3.o clock_orbit_rtcm.o rtcm3torinex.o
-	$(CXX) $(CXXFLAGS) -lm -o $@ readRTCM3.o clock_orbit_rtcm.o rtcm3torinex.o
-	
+	$(CXX) $(CXXFLAGSRL) -o $@ readRTCM3.o clock_orbit_rtcm.o rtcm3torinex.o
 
 clean:
Index: /trunk/clock_and_orbit/readco.c
===================================================================
--- /trunk/clock_and_orbit/readco.c	(revision 6553)
+++ /trunk/clock_and_orbit/readco.c	(revision 6554)
@@ -4,4 +4,5 @@
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <math.h>
 
@@ -18,18 +19,18 @@
 
 void printClockOrbit(const char* filename, struct ClockOrbit* clockOrb,
-        char* flag, int ind, char satSys, int offsetGnss);
+        const char* flag, int ind, char satSys, int offsetGnss);
 void printClockOrbitDiff(const char* filename, struct ClockOrbit* clockOrb1,
-        struct ClockOrbit* clockOrb2, char* flag, int ind, char satSys, int offsetGnss);
+        struct ClockOrbit* clockOrb2, const char* flag, int ind, char satSys, int offsetGnss);
 void printCodeBias(const char* filename, struct CodeBias* codeBias,
-        char* flag,int ind, char satSys, int offsetGnss);
+        const char* flag,int ind, char satSys, int offsetGnss);
 void printCodeBiasDiff(const char* filename, struct CodeBias* codeBias1,
-        struct CodeBias* codeBias2, char* flag, int ind, char satSys,
+        struct CodeBias* codeBias2, const char* flag, int ind, char satSys,
         int offsetGnss);
 
 int main(void) {
-    enum COR_SATSYSTEM sys;
-    char* inputFile = "ssr1_cocb_data/CLK801330.14C";
+    SATSYS sys;
+    const char * inputFile = "ssr1_cocb_data/CLK801330.14C";
     for (sys = GPS; sys <= BDS; ++sys) {
-        char *outFilenameRaw, *outFilenameDbg;
+        const char *outFilenameRaw, *outFilenameDbg;
         enum COR_SATSYSTEM CLOCKORBIT_SATGNSS = sys;
         enum COR_OFFSETS CLOCKORBIT_OFFSETGNSS;
@@ -84,7 +85,7 @@
             double cbValue[3] = { 0.0 }, clock_a0 = 0.0, clock_a1 = 0.0, clock_a2 = 0.0, d_radial = 0.0;
             double d_along = 0.0, d_outofplane = 0.0, dd_radial = 0.0, dd_along = 0.0, dd_outofplane = 0.0;
-            enum CodeType cbType[3] = { 0 };
+            int cbType[3] = { 0 };
             static double tow_co, tow_cb;
-            int num = sscanf(buffer, "%d ", &messageType);
+            sscanf(buffer, "%d ", &messageType);
             if (messageType == messageTypeCo[GPS]) {
                 sscanf(buffer,
@@ -270,5 +271,5 @@
         }
         free(buffer);
-        close(asciiSsr);
+        fclose(asciiSsr);
     }
     return 0;
@@ -276,5 +277,5 @@
 
 void printClockOrbit(const char* filename, struct ClockOrbit* clockOrb,
-        char* flag, int ind, char satSys, int offsetGnss) {
+        const char* flag, int ind, char satSys, int offsetGnss) {
     int i = 0;
     FILE *filestream = fopen(filename, "ab+");
@@ -306,5 +307,5 @@
 
 void printClockOrbitDiff(const char* filename, struct ClockOrbit* clockOrb1,
-        struct ClockOrbit* clockOrb2, char* flag, int ind, char satSys,
+        struct ClockOrbit* clockOrb2, const char* flag, int ind, char satSys,
         int offsetGnss) {
     int i = 0;
@@ -349,5 +350,5 @@
 }
 
-void printCodeBias(const char* filename, struct CodeBias* codeBias, char* flag,
+void printCodeBias(const char* filename, struct CodeBias* codeBias, const char* flag,
         int ind, char satSys, int offsetGnss) {
     int i = 0;
@@ -375,5 +376,5 @@
 
 void printCodeBiasDiff(const char* filename, struct CodeBias* codeBias1,
-        struct CodeBias* codeBias2, char* flag, int ind, char satSys,
+        struct CodeBias* codeBias2, const char* flag, int ind, char satSys,
         int offsetGnss) {
     int i = 0;