Split actual library code and tests into separate subdirectories.

ddunbar · Oct 8, 2011 · 4bc5044 · 4bc5044
1 parent 898fe87
commit 4bc5044
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ ExtraFlags := \
 	-pedantic -Wall -Wextra \
 	-Wno-unused-parameter -Wno-missing-field-initializers
 CommonFlags := $(CFLAGS) $(OPTFLAGS) $(ExtraFlags)
-CompileOnlyFlags := -std=c99
+CompileOnlyFlags := -std=c99 -I$(SRCROOT)/src
 CompileFlags := $(CompileOnlyFlags) $(CommonFlags)
 LinkFlags := $(CommonFlags)
 LinkFlags.glutTest := $(LinkFlags) \
@@ -48,7 +48,9 @@ $(OBJROOT)/glutTest: $(Objects.glutTest)
 $(OBJROOT)/perfTest: $(Objects.perfTest)
 	$(LD) -o $@ $(Objects.perfTest) $(LinkFlags.perfTest)
 
-$(OBJROOT)/%.o: $(SRCROOT)/%.c $(Headers) Makefile $(OBJROOT)/.dir
+$(OBJROOT)/%.o: $(SRCROOT)/tests/%.c $(Headers) Makefile $(OBJROOT)/.dir
+	$(CC) -c -o $@ $< $(CompileFlags)
+$(OBJROOT)/%.o: $(SRCROOT)/src/%.c $(Headers) Makefile $(OBJROOT)/.dir
 	$(CC) -c -o $@ $< $(CompileFlags)
 
 %/.dir:

diff --git a/CCGSubSurf.c → src/CCGSubSurf.c b/CCGSubSurf.c → src/CCGSubSurf.c
diff --git a/CCGSubSurf.h → src/CCGSubSurf.h b/CCGSubSurf.h → src/CCGSubSurf.h
diff --git a/QMesh.c → tests/QMesh.c b/QMesh.c → tests/QMesh.c
diff --git a/QMesh.h → tests/QMesh.h b/QMesh.h → tests/QMesh.h
diff --git a/glutTest.c → tests/glutTest.c b/glutTest.c → tests/glutTest.c
diff --git a/perfTest.c → tests/perfTest.c b/perfTest.c → tests/perfTest.c