move src into subdir

23 files changed, 10 insertions, 23 deletions

diff --git a/.gitignore b/.gitignore
index 68c26be..54f93cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 TAGS
-*.o
 /build
 /ninja
 /ninja_test
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 4cb4f8e..0000000
--- a/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-CC=$(CXX)
-CXXFLAGS := -Wall -g
-
-all_i_currently_care_about: ninja_test
-
-OBJS=parsers.o ninja_jumble.o
-TESTS=parsers_test.o ninja_test.o
-
-ninja_test: LDFLAGS = -lgtest -lgtest_main -lpthread
-ninja_test: $(OBJS) $(TESTS)
-
-ninja: ninja.o $(OBJS)
diff --git a/build.ninja b/build.ninja
index 3998cbe..9661782 100644
--- a/build.ninja
+++ b/build.ninja
@@ -31,20 +31,20 @@ rule link
 # These build rules build the ".o" files from the ".cc" files,
 # build "ninja.a" by linking the builddir's "ninja.o",
 # and build that "ninja.o" by compiling "ninja.cc".
-build @build.o: cxx build.cc
-build @parsers.o: cxx parsers.cc
-build @subprocess.o: cxx subprocess.cc
-build @util.o: cxx util.cc
-build @ninja_jumble.o: cxx ninja_jumble.cc
+build @build.o: cxx src/build.cc
+build @parsers.o: cxx src/parsers.cc
+build @subprocess.o: cxx src/subprocess.cc
+build @util.o: cxx src/util.cc
+build @ninja_jumble.o: cxx src/ninja_jumble.cc
 build @ninja.a: ar @build.o @parsers.o @subprocess.o @util.o @ninja_jumble.o
 
-build @ninja.o: cxx ninja.cc
+build @ninja.o: cxx src/ninja.cc
 build ninja: link @ninja.o @ninja.a
 
-build @build_test.o: cxx build_test.cc
-build @ninja_test.o: cxx ninja_test.cc
-build @parsers_test.o: cxx parsers_test.cc
-build @subprocess_test.o: cxx subprocess_test.cc
+build @build_test.o: cxx src/build_test.cc
+build @ninja_test.o: cxx src/ninja_test.cc
+build @parsers_test.o: cxx src/parsers_test.cc
+build @subprocess_test.o: cxx src/subprocess_test.cc
 build ninja_test: link @build_test.o @ninja_test.o @parsers_test.o \
       @subprocess_test.o @ninja.a
   ldflags = -g -rdynamic -lgtest -lgtest_main -lpthread
diff --git a/gyp.patch b/misc/gyp.patch
index aee8098..aee8098 100644
--- a/gyp.patch
+++ b/misc/gyp.patch
diff --git a/ninja-mode.el b/misc/ninja-mode.el
index ddbcfd8..ddbcfd8 100644
--- a/ninja-mode.el
+++ b/misc/ninja-mode.el
diff --git a/build.cc b/src/build.cc
index c8e9f27..c8e9f27 100644
--- a/build.cc
+++ b/src/build.cc
diff --git a/build.h b/src/build.h
index cf0e67f..cf0e67f 100644
--- a/build.h
+++ b/src/build.h
diff --git a/build_test.cc b/src/build_test.cc
index 2ded588..2ded588 100644
--- a/build_test.cc
+++ b/src/build_test.cc
diff --git a/eval_env.h b/src/eval_env.h
index a630e7a..a630e7a 100644
--- a/eval_env.h
+++ b/src/eval_env.h
diff --git a/graphviz.h b/src/graphviz.h
index d688a15..d688a15 100644
--- a/graphviz.h
+++ b/src/graphviz.h
diff --git a/ninja.cc b/src/ninja.cc
index f39c77f..f39c77f 100644
--- a/ninja.cc
+++ b/src/ninja.cc
diff --git a/ninja.h b/src/ninja.h
index ecfb2d0..ecfb2d0 100644
--- a/ninja.h
+++ b/src/ninja.h
diff --git a/ninja_jumble.cc b/src/ninja_jumble.cc
index 4a30eba..4a30eba 100644
--- a/ninja_jumble.cc
+++ b/src/ninja_jumble.cc
diff --git a/ninja_test.cc b/src/ninja_test.cc
index 12ba93c..12ba93c 100644
--- a/ninja_test.cc
+++ b/src/ninja_test.cc
diff --git a/parsers.cc b/src/parsers.cc
index 4d6c058..4d6c058 100644
--- a/parsers.cc
+++ b/src/parsers.cc
diff --git a/parsers.h b/src/parsers.h
index fc20436..fc20436 100644
--- a/parsers.h
+++ b/src/parsers.h
diff --git a/parsers_test.cc b/src/parsers_test.cc
index 6bd8e4b..6bd8e4b 100644
--- a/parsers_test.cc
+++ b/src/parsers_test.cc
diff --git a/subprocess.cc b/src/subprocess.cc
index 7bf4fc3..7bf4fc3 100644
--- a/subprocess.cc
+++ b/src/subprocess.cc
diff --git a/subprocess.h b/src/subprocess.h
index 2c91f4a..2c91f4a 100644
--- a/subprocess.h
+++ b/src/subprocess.h
diff --git a/subprocess_test.cc b/src/subprocess_test.cc
index 51d4a11..51d4a11 100644
--- a/subprocess_test.cc
+++ b/src/subprocess_test.cc
diff --git a/test.h b/src/test.h
index 4d45a2e..4d45a2e 100644
--- a/test.h
+++ b/src/test.h
diff --git a/util.cc b/src/util.cc
index 7a1c4e6..7a1c4e6 100644
--- a/util.cc
+++ b/src/util.cc
diff --git a/util.h b/src/util.h
index d0f0815..d0f0815 100644
--- a/util.h
+++ b/src/util.h