Merge pull request #6 from johnm/master

Update kmin_test and add .gitignore
attractivechaos · 15ddda3d9de9d4c0c798806a34d297f92d564c65 · attractivechaos committed Jan 26, 2013 · Jan 26, 2013 · 15ddda3
2 parents 03e2f3d + cd92069
commit 15ddda3d9de9d4c0c798806a34d297f92d564c65
Unified Split

Showing with 42 additions and 3 deletions.

+39 −0 .gitignore

+2 −2 test/Makefile

+1 −1 test/kmin_test.c
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,39 @@
+# General
+*.a
+*.dSYM/
+*.la
+*.lo
+*.o
+*.opensdf
+*.orig
+*.sdf
+*.suo
+*.swp
+*.tests
+*.vcxproj.filters
+*.vcxproj.user
+*~
+.git
+TAGS
+
+# Mac/Xcode-specfic
+xcuserdata
+contents.xcworkspacedata
+.DS_Store
+._*
+
+# Test byproducts
+test/kbtree_test
+test/khash_keith
+test/khash_keith2
+test/khash_test
+test/klist_test
+test/kmin_test
+test/kseq_bench
+test/kseq_bench2
+test/kseq_test
+test/ksort_test
+test/ksort_test-stl
+test/kstring_bench
+test/kstring_bench2
+test/kvec_test
diff --git a/test/Makefile b/test/Makefile
@@ -43,8 +43,8 @@ ksort_test-stl:ksort_test.cc ../ksort.h
 kvec_test:kvec_test.cc ../kvec.h
 		$(CXX) $(CXXFLAGS) -o $@ kvec_test.cc
 
-kmin_test:kmin_test.c ../kmin.h ../kmin.c
-		$(CC) $(CFLAGS) -o $@ kmin_test.c ../kmin.c
+kmin_test:kmin_test.c ../kmath.h ../kmath.c
+		$(CC) $(CFLAGS) -o $@ kmin_test.c ../kmath.c
 
 kstring_bench:kstring_bench.c ../kstring.h ../kstring.c
 		$(CC) $(CFLAGS) -o $@ kstring_bench.c ../kstring.c
diff --git a/test/kmin_test.c b/test/kmin_test.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <math.h>
-#include "kmin.h"
+#include "kmath.h"
 
 static int n_evals;