Index: hvcontrol/Makefile
===================================================================
--- hvcontrol/Makefile	(revision 126)
+++ hvcontrol/Makefile	(revision 135)
@@ -3,13 +3,12 @@
 #
 
-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 
+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
+INCDIRS   = -I. -I./src -I../Evidence/DIM/
 
 CPPFLAGS = -O3 -Wall -DOS_LINUX $(INCDIRS)
 LDLIBS = -lstdc++ -lpthread -lfl -lreadline -ltermcap
 
-hvcontrol: $(OBJECTS) ../../Evidence/DIM/linux/libdim.a
-#	$(CC) $(CPPFLAGS) -o $@ $(OBJECTS) $(LIBS)
+hvcontrol: $(OBJECTS) ../Evidence/DIM/libdim.a
 
 clean:
@@ -22,8 +21,4 @@
 # Implicit rules
 
-#%.o : %.cc
-#	$(CC) $(CPPFLAGS) $(INCDIRS) -c -o $@ $<
-#%.o : %.cpp
-#	$(CC) $(CPPFLAGS) $(INCDIRS) -c -o $@ $<
 %.d :
 	@echo "Generating dependencies" $@