--- a/Makefile	Sat Feb 12 13:48:14 2011 +0300
+++ b/Makefile	Sat Feb 12 15:10:08 2011 +0300
@@ -1,27 +1,27 @@
 
 include config.mk
 
-all: cos-dbupdate cos-search scan
+all: cos-dbupdate cos-search scan extractors
 
 scan: ${OBJS}
-	@echo CC -o $@
-	@g++ ${OBJS} ${LDFLAGS} -o $@
+	@echo C++ -o $@
+	@${CXX} ${OBJS} ${LDFLAGS} -o $@
 
 clean:
-	rm -f ${OBJS} scan
+	rm -f ${OBJS} cos-dbupdate cos-search scan
 
 walker.o: walker.cxx walker.h
-	@g++ -c ${CFLAGS} walker.cxx
-
-#magi.o: magi.cxx walker.h
-#	@g++ -c ${CFLAGS} magi.cxx
+	@echo C++ $<
+	@${CXX} -c ${CFLAGS} walker.cxx
 
 scan.o: walker.h scan.cxx
-	@g++ -c ${CFLAGS} scan.cxx
-
+	@echo C++ $<
+	@${CXX} -c ${CFLAGS} scan.cxx
 
 cos-dbupdate: cos-dbupdate.cxx
-	g++ -O0 -g cos-dbupdate.cxx -o cos-dbupdate ${CFLAGS} ${LDFLAGS}
+	@echo C++ $<
+	@${CXX} -O0 -g cos-dbupdate.cxx -o cos-dbupdate ${CFLAGS} ${LDFLAGS}
 
 cos-search: cos-search.cxx
-	g++ -O0 -g cos-search.cxx -o cos-search ${CFLAGS} ${LDFLAGS}
\ No newline at end of file
+	@echo C++ $<
+	@${CXX} -O0 -g cos-search.cxx -o cos-search ${CFLAGS} ${LDFLAGS}
\ No newline at end of file