Moving source code out of src once more, to help godoc results.
diff --git a/Makefile b/Makefile
index 2f61404..1a4953b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,35 @@
+include $(GOROOT)/src/Make.inc
-$(.DEFAULT_GOAL) $(MAKECMDGOALS): subdirs
+TARG=gocheck
+GOFMT=gofmt -spaces=true -tabindent=false -tabwidth=4
+
+GOFILES=\
+ gocheck.go\
+ helpers.go\
+ run.go\
+
+include $(GOROOT)/src/Make.pkg
+
+format:
+ ${GOFMT} -w gocheck.go
+ ${GOFMT} -w helpers.go
+ ${GOFMT} -w run.go
+
+
+
+testpackage: _test/gocheck/local.a
+
+_test/gocheck/local.a: local/_test/gocheck/local.a
+ @mkdir -p _test/gocheck
+ cp local/_test/gocheck/local.a _test/gocheck
+
+local/_test/gocheck/local.a:
+ make -C local _test/gocheck/local.a
+
+
+all test install clean: subdirs
subdirs:
- make -C src $(MAKECMDGOALS)
- make -C src/local $(MAKECMDGOALS)
+ make -C local $(MAKECMDGOALS)
.PHONY: subdirs
diff --git a/src/bootstrap_test.go b/bootstrap_test.go
similarity index 100%
rename from src/bootstrap_test.go
rename to bootstrap_test.go
diff --git a/src/fixture_test.go b/fixture_test.go
similarity index 100%
rename from src/fixture_test.go
rename to fixture_test.go
diff --git a/src/foundation_test.go b/foundation_test.go
similarity index 100%
rename from src/foundation_test.go
rename to foundation_test.go
diff --git a/src/gocheck.go b/gocheck.go
similarity index 100%
rename from src/gocheck.go
rename to gocheck.go
diff --git a/src/gocheck_test.go b/gocheck_test.go
similarity index 100%
rename from src/gocheck_test.go
rename to gocheck_test.go
diff --git a/src/helpers.go b/helpers.go
similarity index 100%
rename from src/helpers.go
rename to helpers.go
diff --git a/src/helpers_test.go b/helpers_test.go
similarity index 100%
rename from src/helpers_test.go
rename to helpers_test.go
diff --git a/src/local/Makefile b/local/Makefile
similarity index 100%
rename from src/local/Makefile
rename to local/Makefile
diff --git a/src/local/local.go b/local/local.go
similarity index 100%
rename from src/local/local.go
rename to local/local.go
diff --git a/src/local/local_test.go b/local/local_test.go
similarity index 100%
rename from src/local/local_test.go
rename to local/local_test.go
diff --git a/src/run.go b/run.go
similarity index 100%
rename from src/run.go
rename to run.go
diff --git a/src/run_test.go b/run_test.go
similarity index 100%
rename from src/run_test.go
rename to run_test.go
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 68b538f..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-include $(GOROOT)/src/Make.inc
-
-TARG=gocheck
-GOFMT=gofmt -spaces=true -tabindent=false -tabwidth=4
-
-GOFILES=\
- gocheck.go\
- helpers.go\
- run.go\
-
-include $(GOROOT)/src/Make.pkg
-
-format:
- ${GOFMT} -w gocheck.go
- ${GOFMT} -w helpers.go
- ${GOFMT} -w run.go
-
-
-
-testpackage: _test/gocheck/local.a
-
-_test/gocheck/local.a: local/_test/gocheck/local.a
- @mkdir -p _test/gocheck
- cp local/_test/gocheck/local.a _test/gocheck
-
-local/_test/gocheck/local.a:
- make -C local _test/gocheck/local.a
