From df55a809f15db1560ba5b81574ddb93261aa5d7c Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Tue, 11 Dec 2012 18:28:10 -0500 Subject: [PATCH] Attempting to collapse package up a level since I'm not feeling like I'm going to tackle this in another language... yet. --- conway/{go => }/Makefile | 4 ++-- conway/{go => }/conway_test.go | 2 +- conway/{go => }/conways-game-of-life/main.go | 2 +- conway/{go => }/game_of_life.go | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename conway/{go => }/Makefile (64%) rename conway/{go => }/conway_test.go (99%) rename conway/{go => }/conways-game-of-life/main.go (97%) rename conway/{go => }/game_of_life.go (100%) diff --git a/conway/go/Makefile b/conway/Makefile similarity index 64% rename from conway/go/Makefile rename to conway/Makefile index e283d23..c9c43dd 100644 --- a/conway/go/Makefile +++ b/conway/Makefile @@ -1,8 +1,8 @@ LIBS := \ - github.com/meatballhat/box-o-sand/conway/go + github.com/meatballhat/box-o-sand/conway TARGETS := \ $(LIBS) \ - github.com/meatballhat/box-o-sand/conway/go/conways-game-of-life + github.com/meatballhat/box-o-sand/conway/conways-game-of-life all: deps build diff --git a/conway/go/conway_test.go b/conway/conway_test.go similarity index 99% rename from conway/go/conway_test.go rename to conway/conway_test.go index a044858..6974f71 100644 --- a/conway/go/conway_test.go +++ b/conway/conway_test.go @@ -7,7 +7,7 @@ import ( ) import ( - . "github.com/meatballhat/box-o-sand/conway/go" + . "github.com/meatballhat/box-o-sand/conway" ) var TEST_SIMPLE_INITIAL_STATE = NewGameState(16, 16) diff --git a/conway/go/conways-game-of-life/main.go b/conway/conways-game-of-life/main.go similarity index 97% rename from conway/go/conways-game-of-life/main.go rename to conway/conways-game-of-life/main.go index f379310..8eac099 100644 --- a/conway/go/conways-game-of-life/main.go +++ b/conway/conways-game-of-life/main.go @@ -8,7 +8,7 @@ import ( ) import ( - . "github.com/meatballhat/box-o-sand/conway/go" + . "github.com/meatballhat/box-o-sand/conway" ) var ( diff --git a/conway/go/game_of_life.go b/conway/game_of_life.go similarity index 100% rename from conway/go/game_of_life.go rename to conway/game_of_life.go