reorganize into subdirectories

mackstann · Mar 23, 2010 · ed6afe1 · ed6afe1
1 parent 5d844ca
commit ed6afe1
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -1,22 +1,22 @@
-all: glib_hash_table stl_unordered_map boost_unordered_map google_sparse_hash_map google_dense_hash_map qt_qhash python_dict
+all: build/glib_hash_table build/stl_unordered_map build/boost_unordered_map build/google_sparse_hash_map build/google_dense_hash_map build/qt_qhash build/python_dict
 
-glib_hash_table: glib_hash_table.c Makefile
-	gcc -O2 `pkg-config --cflags --libs glib-2.0` glib_hash_table.c -o glib_hash_table
+build/glib_hash_table: src/glib_hash_table.c Makefile
+	gcc -O2 `pkg-config --cflags --libs glib-2.0` src/glib_hash_table.c -o build/glib_hash_table
 
-stl_unordered_map: stl_unordered_map.cc Makefile
-	g++ -O2 stl_unordered_map.cc -o stl_unordered_map -std=c++0x
+build/stl_unordered_map: src/stl_unordered_map.cc Makefile
+	g++ -O2 src/stl_unordered_map.cc -o build/stl_unordered_map -std=c++0x
 
-boost_unordered_map: boost_unordered_map.cc Makefile
-	g++ -O2 boost_unordered_map.cc -o boost_unordered_map
+build/boost_unordered_map: src/boost_unordered_map.cc Makefile
+	g++ -O2 src/boost_unordered_map.cc -o build/boost_unordered_map
 
-google_sparse_hash_map: google_sparse_hash_map.cc Makefile
-	g++ -O2 google_sparse_hash_map.cc -o google_sparse_hash_map
+build/google_sparse_hash_map: src/google_sparse_hash_map.cc Makefile
+	g++ -O2 src/google_sparse_hash_map.cc -o build/google_sparse_hash_map
 
-google_dense_hash_map: google_dense_hash_map.cc Makefile
-	g++ -O2 google_dense_hash_map.cc -o google_dense_hash_map
+build/google_dense_hash_map: src/google_dense_hash_map.cc Makefile
+	g++ -O2 src/google_dense_hash_map.cc -o build/google_dense_hash_map
 
-qt_qhash: qt_qhash.cc Makefile
-	g++ -O2 `pkg-config --cflags --libs QtCore` qt_qhash.cc -o qt_qhash
+build/qt_qhash: src/qt_qhash.cc Makefile
+	g++ -O2 `pkg-config --cflags --libs QtCore` src/qt_qhash.cc -o build/qt_qhash
 
-python_dict: python_dict.c Makefile
-	gcc -O2 -I/usr/include/python2.6 -lpython2.6 python_dict.c -o python_dict
+build/python_dict: src/python_dict.c Makefile
+	gcc -O2 -I/usr/include/python2.6 -lpython2.6 src/python_dict.c -o build/python_dict
diff --git a/bench.py b/bench.py
@@ -31,7 +31,7 @@
 
             for attempt in range(3): # best of 3
                 before = time.time()
-                proc = subprocess.Popen(['./'+program, str(nkeys), benchtype], stdout=subprocess.PIPE)
+                proc = subprocess.Popen(['./build/'+program, str(nkeys), benchtype], stdout=subprocess.PIPE)
 
                 # wait for the program to fill up memory and spit out its "ready" message
                 proc.stdout.read(1)

diff --git a/boost_unordered_map.cc → src/boost_unordered_map.cc b/boost_unordered_map.cc → src/boost_unordered_map.cc
diff --git a/glib_hash_table.c → src/glib_hash_table.c b/glib_hash_table.c → src/glib_hash_table.c
diff --git a/google_dense_hash_map.cc → src/google_dense_hash_map.cc b/google_dense_hash_map.cc → src/google_dense_hash_map.cc
diff --git a/google_sparse_hash_map.cc → src/google_sparse_hash_map.cc b/google_sparse_hash_map.cc → src/google_sparse_hash_map.cc
diff --git a/python_dict.c → src/python_dict.c b/python_dict.c → src/python_dict.c
diff --git a/qt_qhash.cc → src/qt_qhash.cc b/qt_qhash.cc → src/qt_qhash.cc
diff --git a/stl_unordered_map.cc → src/stl_unordered_map.cc b/stl_unordered_map.cc → src/stl_unordered_map.cc
diff --git a/template.c → src/template.c b/template.c → src/template.c