c767b1 merge makefile changes from branch

Authored and Committed by Chris PeBenito 14 years ago
    merge makefile changes from branch
    
    
        
file modified
+7 -0
file modified
+6 -1
file modified
+31 -28
file modified
+13 -0
file modified
+47 -35
file modified
+31 -18