Index: hvcontrol/Makefile
===================================================================
--- hvcontrol/Makefile	(revision 93)
+++ hvcontrol/Makefile	(revision 126)
@@ -3,16 +3,16 @@
 #
 
-SOURCES = hvcontrol.cpp src/HV.cc src/HVConfig.cc src/HVCalib.cc src/ProcessIO.cc ../pixelmap/Pixel.cc ../pixelmap/PixelMap.cc ../drsdaq/SlowData.cc
-OBJECTS = $(addsuffix .o, $(basename $(SOURCES)))
-INCDIRS   = -I. -I./src
+SOURCES = hvcontrol.cpp src/HV.cc src/HVConfig.cc src/HVCalib.cc src/ProcessIO.cc ../pixelmap/Pixel.cc ../pixelmap/PixelMap.cc ../drsdaq/SlowData.cc ../../Evidence/Evidence.cc 
+OBJECTS = $(addsuffix .o, $(basename $(SOURCES))) 
+INCDIRS   = -I. -I./src -I../../Evidence/DIM/dim
 
-CPPFLAGS = -O3 -Wall -DOS_LINUX
-LIBS = -lstdc++ -lpthread -lfl -lreadline -ltermcap
+CPPFLAGS = -O3 -Wall -DOS_LINUX $(INCDIRS)
+LDLIBS = -lstdc++ -lpthread -lfl -lreadline -ltermcap
 
-hvcontrol: $(OBJECTS)
-	$(CC) $(CPPFLAGS) -o $@ $(OBJECTS) $(LIBS)
+hvcontrol: $(OBJECTS) ../../Evidence/DIM/linux/libdim.a
+#	$(CC) $(CPPFLAGS) -o $@ $(OBJECTS) $(LIBS)
 
 clean:
-	@rm -f $(OBJECTS) $(SOBJECTS).so
+	@rm -f $(OBJECTS)
 	@rm -f *.d
 	@rm -f *~
@@ -22,8 +22,8 @@
 # Implicit rules
 
-%.o : %.cc
-	$(CC) $(CPPFLAGS) $(INCDIRS) -c -o $@ $<
-%.o : %.cpp
-	$(CC) $(CPPFLAGS) $(INCDIRS) -c -o $@ $<
+#%.o : %.cc
+#	$(CC) $(CPPFLAGS) $(INCDIRS) -c -o $@ $<
+#%.o : %.cpp
+#	$(CC) $(CPPFLAGS) $(INCDIRS) -c -o $@ $<
 %.d :
 	@echo "Generating dependencies" $@