From 3d24f88327a6c110c51acd37146e677d09364e50 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sun, 29 May 2011 05:30:03 -0700 Subject: [PATCH] nesting basic stuff in its own tree --- .gitignore | 2 +- Makefile | 17 +++-------------- basics/Makefile | 16 ++++++++++++++++ {bin => basics/bin}/.keep | 0 {src => basics/src}/hello-world.cpp | 0 5 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 basics/Makefile rename {bin => basics/bin}/.keep (100%) rename {src => basics/src}/hello-world.cpp (100%) diff --git a/.gitignore b/.gitignore index 36f971e..bf25c60 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -bin/* +*/bin/* diff --git a/Makefile b/Makefile index 1e5722a..3451643 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,5 @@ -CPPC := g++ +all: + cd ./basics && $(MAKE) -ALL_TARGETS = bin/hello-world - -bin/%: src/%.cpp - $(CPPC) $^ -o $@ - - -all: $(ALL_TARGETS) - -clean: - rm -vf ./bin/* - - -.PHONY: all clean +.PHONY: all diff --git a/basics/Makefile b/basics/Makefile new file mode 100644 index 0000000..1e5722a --- /dev/null +++ b/basics/Makefile @@ -0,0 +1,16 @@ +CPPC := g++ + +ALL_TARGETS = bin/hello-world + + +bin/%: src/%.cpp + $(CPPC) $^ -o $@ + + +all: $(ALL_TARGETS) + +clean: + rm -vf ./bin/* + + +.PHONY: all clean diff --git a/bin/.keep b/basics/bin/.keep similarity index 100% rename from bin/.keep rename to basics/bin/.keep diff --git a/src/hello-world.cpp b/basics/src/hello-world.cpp similarity index 100% rename from src/hello-world.cpp rename to basics/src/hello-world.cpp