From 96e7a77bc1fd583984a433969435d860decc4bff Mon Sep 17 00:00:00 2001
From: Mike Long <mikelong2005@gmail.com>
Date: Tue, 21 Dec 2010 23:07:30 +0100
Subject: [PATCH] Moved examples out of test directory

---
 Makefile                                     |  4 +-
 src/examples/Makefile                        | 68 +++++++++++++++++++
 src/{test => examples}/cmocktest.c           |  0
 src/{test => examples}/cppmocktest.cpp       |  0
 src/{test => examples}/embedded.c            |  0
 src/{test => examples}/embedded.h            |  0
 src/{test => examples}/test_suite_template.c |  0
 src/test/Makefile                            | 69 +-------------------
 8 files changed, 74 insertions(+), 67 deletions(-)
 create mode 100644 src/examples/Makefile
 rename src/{test => examples}/cmocktest.c (100%)
 rename src/{test => examples}/cppmocktest.cpp (100%)
 rename src/{test => examples}/embedded.c (100%)
 rename src/{test => examples}/embedded.h (100%)
 rename src/{test => examples}/test_suite_template.c (100%)

diff --git a/Makefile b/Makefile
index 6794b48..4495a0b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 all: 
 	cd src/test; make all
-	
+	cd src/examples; make all
+
 clean: 
 	cd src/test; make clean
+	cd src/examples; make clean
diff --git a/src/examples/Makefile b/src/examples/Makefile
new file mode 100644
index 0000000..9b5b264
--- /dev/null
+++ b/src/examples/Makefile
@@ -0,0 +1,68 @@
+$(VERBOSE).SILENT:
+
+TEMPLATE_PROGNAME = ../../build/template
+C_PROGNAME = ../../build/cmock
+CPP_PROGNAME = ../../build/cppmock
+CC = gcc
+CC += -c
+CPP = g++
+CPP += -c
+LD = g++
+
+ODIR = ../../build
+
+C_OBJFILES = ../../build/cmocktest.o ../../build/embedded.o
+TEMPLATE_OBJFILES = ../../build/test_suite_template.o
+CPP_OBJFILES = ../../build/cppmocktest.o ../../build/embedded.o
+CPP_LIBS = -lgtest -lpthread -lgtest_main
+
+ODIR = ../../build
+
+all: $(C_PROGNAME) $(CPP_PROGNAME) $(TEMPLATE_PROGNAME)
+
+.PHONY: clean
+
+clean:
+	@echo "Cleaning object files"
+	@echo "    rm -f     ../../build/*.o"
+	rm -f ../../build/*.o
+	@echo "Cleaning backups"
+	@echo "    rm -f     *~"
+	rm -f *~
+	@echo "Removing programs"
+	@echo "    rm -f     "$(C_PROGNAME)
+	rm -f $(C_PROGNAME)
+	@echo "    rm -f     "$(CPP_PROGNAME)
+	rm -f $(CPP_PROGNAME)
+
+
+../../build/%.o: %.c
+	@echo "Compiling "$@
+	@echo "    CC        "$<
+	$(CC)  -o $@ $<
+
+../../build/%.o: %.cpp
+	@echo "Compiling "$@
+	@echo "    CPP       "$<
+	$(CPP) -I/home/mlong/tools/gtest/gtest-1.5.0/include -o $@ $< 
+
+$(TEMPLATE_PROGNAME): $(TEMPLATE_OBJFILES)
+	@echo "Linking "$@
+	@echo "    LD        -o "ctemplate"        "$(TEMPLATE_OBJFILES)
+	$(LD) -o $(TEMPLATE_PROGNAME) $(TEMPLATE_OBJFILES)
+
+$(C_PROGNAME): $(C_OBJFILES)
+	@echo "Linking "$@
+	@echo "    LD        -o "$(C_PROGNAME)"        "$(C_OBJFILES)
+	$(LD) -o $(C_PROGNAME) $(C_OBJFILES)
+
+$(CPP_PROGNAME): $(CPP_OBJFILES) $(C_OBJFILES)
+	@echo "Linking "$@
+	@echo "    LD        -o "$(CPP_PROGNAME)"        "$(CPP_OBJFILES)
+	$(LD) -L/home/mlong/tools/gtest -o $(CPP_PROGNAME) $(CPP_OBJFILES) $(CPP_LIBS)
+
+
+
+nothing:
+	@echo "Nothing to do; quitting  :("
+	@echo "HINT: Try make all"
diff --git a/src/test/cmocktest.c b/src/examples/cmocktest.c
similarity index 100%
rename from src/test/cmocktest.c
rename to src/examples/cmocktest.c
diff --git a/src/test/cppmocktest.cpp b/src/examples/cppmocktest.cpp
similarity index 100%
rename from src/test/cppmocktest.cpp
rename to src/examples/cppmocktest.cpp
diff --git a/src/test/embedded.c b/src/examples/embedded.c
similarity index 100%
rename from src/test/embedded.c
rename to src/examples/embedded.c
diff --git a/src/test/embedded.h b/src/examples/embedded.h
similarity index 100%
rename from src/test/embedded.h
rename to src/examples/embedded.h
diff --git a/src/test/test_suite_template.c b/src/examples/test_suite_template.c
similarity index 100%
rename from src/test/test_suite_template.c
rename to src/examples/test_suite_template.c
diff --git a/src/test/Makefile b/src/test/Makefile
index 9b5b264..1757704 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -1,68 +1,5 @@
-$(VERBOSE).SILENT:
-
-TEMPLATE_PROGNAME = ../../build/template
-C_PROGNAME = ../../build/cmock
-CPP_PROGNAME = ../../build/cppmock
-CC = gcc
-CC += -c
-CPP = g++
-CPP += -c
-LD = g++
-
-ODIR = ../../build
-
-C_OBJFILES = ../../build/cmocktest.o ../../build/embedded.o
-TEMPLATE_OBJFILES = ../../build/test_suite_template.o
-CPP_OBJFILES = ../../build/cppmocktest.o ../../build/embedded.o
-CPP_LIBS = -lgtest -lpthread -lgtest_main
-
-ODIR = ../../build
-
-all: $(C_PROGNAME) $(CPP_PROGNAME) $(TEMPLATE_PROGNAME)
-
-.PHONY: clean
+all:
+	@echo "all"
 
 clean:
-	@echo "Cleaning object files"
-	@echo "    rm -f     ../../build/*.o"
-	rm -f ../../build/*.o
-	@echo "Cleaning backups"
-	@echo "    rm -f     *~"
-	rm -f *~
-	@echo "Removing programs"
-	@echo "    rm -f     "$(C_PROGNAME)
-	rm -f $(C_PROGNAME)
-	@echo "    rm -f     "$(CPP_PROGNAME)
-	rm -f $(CPP_PROGNAME)
-
-
-../../build/%.o: %.c
-	@echo "Compiling "$@
-	@echo "    CC        "$<
-	$(CC)  -o $@ $<
-
-../../build/%.o: %.cpp
-	@echo "Compiling "$@
-	@echo "    CPP       "$<
-	$(CPP) -I/home/mlong/tools/gtest/gtest-1.5.0/include -o $@ $< 
-
-$(TEMPLATE_PROGNAME): $(TEMPLATE_OBJFILES)
-	@echo "Linking "$@
-	@echo "    LD        -o "ctemplate"        "$(TEMPLATE_OBJFILES)
-	$(LD) -o $(TEMPLATE_PROGNAME) $(TEMPLATE_OBJFILES)
-
-$(C_PROGNAME): $(C_OBJFILES)
-	@echo "Linking "$@
-	@echo "    LD        -o "$(C_PROGNAME)"        "$(C_OBJFILES)
-	$(LD) -o $(C_PROGNAME) $(C_OBJFILES)
-
-$(CPP_PROGNAME): $(CPP_OBJFILES) $(C_OBJFILES)
-	@echo "Linking "$@
-	@echo "    LD        -o "$(CPP_PROGNAME)"        "$(CPP_OBJFILES)
-	$(LD) -L/home/mlong/tools/gtest -o $(CPP_PROGNAME) $(CPP_OBJFILES) $(CPP_LIBS)
-
-
-
-nothing:
-	@echo "Nothing to do; quitting  :("
-	@echo "HINT: Try make all"
+	@echo "clean"