Index: hvcontrol/Makefile
===================================================================
--- hvcontrol/Makefile	(revision 72)
+++ hvcontrol/Makefile	(revision 90)
@@ -3,13 +3,10 @@
 #
 
-SOURCES = hvcontrol.cpp src/CCCommand.cc src/ConsoleCommand.cc src/HV.cc src/HVConfig.cc src/HVCalib.cc src/HVMonitor.cc src/HVStatus.cc src/Log.cc src/ProcessIO.cc src/ReadCard.cc src/Utilities.cc ../pixelmap/Pixel.cc ../pixelmap/PixelMap.cc
-
+SOURCES = hvcontrol.cpp src/HV.cc src/HVConfig.cc src/HVCalib.cc src/ProcessIO.cc ../pixelmap/Pixel.cc ../pixelmap/PixelMap.cc
 OBJECTS = $(addsuffix .o, $(basename $(SOURCES)))
-
 INCDIRS   = -I. -I../pixelmap -I./src
 
-CFLAGS = -pipe -fthread-jumps -funroll-all-loops -O3 -Wall -DOS_LINUX
-CPPFLAGS = -pipe -fPIC -fthread-jumps -funroll-all-loops -O3 -Wall -DOS_LINUX $(VMECTRL)
-LIBS = -lstdc++ -lz -lpthread -lutil -lfl -lusb -lftdi -L/usr/lib -L/sw/lib
+CPPFLAGS = -O3 -Wall -DOS_LINUX
+LIBS = -lstdc++ -lpthread -lfl -lreadline -ltermcap
 
 hvcontrol: $(OBJECTS)
@@ -25,6 +22,4 @@
 # Implicit rules
 
-%.o : %.c
-	$(CC) $(CFLAGS) $(INCDIRS) -c -o $@ $<
 %.o : %.cc
 	$(CC) $(CPPFLAGS) $(INCDIRS) -c -o $@ $<