Fixed dcdblib Makefile

lib/Makefile

@@ -16,7 +16,8 @@ OBJS = src/connection.o \
        src/sensorid.o \
        src/unitconv.o \
        src/virtualsensor.o \
-       src/c_api.o
+       src/c_api.o \
+       src/sensoroperations.o
 
 # List of public header files necessary to use this libray
 PUBHEADERS = $(shell find include -type f -iname "*.h")

tools/dcdbquery/query.cpp

@@ -37,8 +37,7 @@
 
 #include "dcdbendian.h"
 #include "query.h"
-#include "sensordatastore.h"
-#include "sensoroperations.h"
+#include "dcdb/sensoroperations.h"
 
 void DCDBQuery::setLocalTimeEnabled(bool enable) {
   useLocalTime = enable;
@@ -61,9 +60,6 @@ void DCDBQuery::genOutput(std::list<DCDB::SensorDataStoreReading> &results)
 	int64_t prev = 0;
     uint64_t prevT = 0;
     
-    int64_t dx = 0;
-    uint64_t dt = 0;
-    
     /* Print Header */
     std::cout << "Sensor,Time";
     if(valueFormat.printValue) {