diff --git a/src/Makefile b/src/Makefile
index 14df837..6b24391 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,5 @@
-o = ezc.o  
+include Makefile.o.dep
+
 
 all: ezc.a
 
@@ -9,12 +10,14 @@ ezc.a: $(o)
 .SUFFIXES: .cpp .o
 
 .cpp.o:
-	$(CC) -c $(CFLAGS) $<
+	$(CXX) -c $(CXXFLAGS) $<
 
 
 
 depend:
 	makedepend -Y. -f- *.cpp > Makefile.dep
+	echo -n "o = " > Makefile.o.dep
+	ls -1 *.cpp | xargs -I foo echo -n foo " " | sed -E "s/([^\.]*)\.cpp[ ]/\1\.o/g" >> Makefile.o.dep
 
 
 clean:
diff --git a/src/Makefile.o.dep b/src/Makefile.o.dep
new file mode 100755
index 0000000..9806e60
--- /dev/null
+++ b/src/Makefile.o.dep
@@ -0,0 +1 @@
+o = ezc.o