pmundkur
diff --git a/‎Makefile
+24-18 b/‎Makefile
+24-18
diff --git a/‎HOWTO.txt ‎doc/HOWTO.txt b/‎HOWTO.txt ‎doc/HOWTO.txt
diff --git a/‎crm114_config.h ‎include/crm114_config.h b/‎crm114_config.h ‎include/crm114_config.h
diff --git a/‎crm114_datalib.h ‎include/crm114_datalib.h b/‎crm114_datalib.h ‎include/crm114_datalib.h
diff --git a/‎crm114_internal.h ‎include/crm114_internal.h b/‎crm114_internal.h ‎include/crm114_internal.h
diff --git a/‎crm114_lib.h ‎include/crm114_lib.h b/‎crm114_lib.h ‎include/crm114_lib.h
diff --git a/‎crm114_matrix.h ‎include/crm114_matrix.h b/‎crm114_matrix.h ‎include/crm114_matrix.h
diff --git a/‎crm114_matrix_util.h ‎include/crm114_matrix_util.h b/‎crm114_matrix_util.h ‎include/crm114_matrix_util.h
diff --git a/‎crm114_pca.h ‎include/crm114_pca.h b/‎crm114_pca.h ‎include/crm114_pca.h
diff --git a/‎crm114_pca_lib_fncts.h ‎include/crm114_pca_lib_fncts.h b/‎crm114_pca_lib_fncts.h ‎include/crm114_pca_lib_fncts.h
diff --git a/‎crm114_regex.h ‎include/crm114_regex.h b/‎crm114_regex.h ‎include/crm114_regex.h
diff --git a/‎crm114_structs.h ‎include/crm114_structs.h b/‎crm114_structs.h ‎include/crm114_structs.h
diff --git a/‎crm114_svm.h ‎include/crm114_svm.h b/‎crm114_svm.h ‎include/crm114_svm.h
diff --git a/‎crm114_svm_lib_fncts.h ‎include/crm114_svm_lib_fncts.h b/‎crm114_svm_lib_fncts.h ‎include/crm114_svm_lib_fncts.h
diff --git a/‎crm114_svm_quad_prog.h ‎include/crm114_svm_quad_prog.h b/‎crm114_svm_quad_prog.h ‎include/crm114_svm_quad_prog.h
diff --git a/‎crm114_sysincludes.h ‎include/crm114_sysincludes.h b/‎crm114_sysincludes.h ‎include/crm114_sysincludes.h
diff --git a/‎crm114_base.c ‎lib/crm114_base.c b/‎crm114_base.c ‎lib/crm114_base.c
diff --git a/‎crm114_bit_entropy.c ‎lib/crm114_bit_entropy.c b/‎crm114_bit_entropy.c ‎lib/crm114_bit_entropy.c
diff --git a/‎crm114_datalib.c ‎lib/crm114_datalib.c b/‎crm114_datalib.c ‎lib/crm114_datalib.c
diff --git a/‎crm114_fast_substring_compression.c ‎lib/crm114_fast_substring_compression.c b/‎crm114_fast_substring_compression.c ‎lib/crm114_fast_substring_compression.c
diff --git a/‎crm114_hyperspace.c ‎lib/crm114_hyperspace.c b/‎crm114_hyperspace.c ‎lib/crm114_hyperspace.c
diff --git a/‎crm114_markov.c ‎lib/crm114_markov.c b/‎crm114_markov.c ‎lib/crm114_markov.c
diff --git a/‎crm114_markov_microgroom.c ‎lib/crm114_markov_microgroom.c b/‎crm114_markov_microgroom.c ‎lib/crm114_markov_microgroom.c
diff --git a/‎crm114_matrix.c ‎lib/crm114_matrix.c b/‎crm114_matrix.c ‎lib/crm114_matrix.c
diff --git a/‎crm114_matrix_util.c ‎lib/crm114_matrix_util.c b/‎crm114_matrix_util.c ‎lib/crm114_matrix_util.c
diff --git a/‎crm114_pca.c ‎lib/crm114_pca.c b/‎crm114_pca.c ‎lib/crm114_pca.c
diff --git a/‎crm114_pca_lib_fncts.c ‎lib/crm114_pca_lib_fncts.c b/‎crm114_pca_lib_fncts.c ‎lib/crm114_pca_lib_fncts.c
diff --git a/‎crm114_regex_tre.c ‎lib/crm114_regex_tre.c b/‎crm114_regex_tre.c ‎lib/crm114_regex_tre.c
diff --git a/‎crm114_statboost.c ‎lib/crm114_statboost.c b/‎crm114_statboost.c ‎lib/crm114_statboost.c
diff --git a/‎crm114_strnhash.c ‎lib/crm114_strnhash.c b/‎crm114_strnhash.c ‎lib/crm114_strnhash.c
diff --git a/‎crm114_svm.c ‎lib/crm114_svm.c b/‎crm114_svm.c ‎lib/crm114_svm.c
diff --git a/‎crm114_svm_lib_fncts.c ‎lib/crm114_svm_lib_fncts.c b/‎crm114_svm_lib_fncts.c ‎lib/crm114_svm_lib_fncts.c
diff --git a/‎crm114_svm_quad_prog.c ‎lib/crm114_svm_quad_prog.c b/‎crm114_svm_quad_prog.c ‎lib/crm114_svm_quad_prog.c
diff --git a/‎crm114_util.c ‎lib/crm114_util.c b/‎crm114_util.c ‎lib/crm114_util.c
diff --git a/‎crm114_vector_tokenize.c ‎lib/crm114_vector_tokenize.c b/‎crm114_vector_tokenize.c ‎lib/crm114_vector_tokenize.c
diff --git a/‎old_crm114_hyperspace.c ‎lib/old_crm114_hyperspace.c b/‎old_crm114_hyperspace.c ‎lib/old_crm114_hyperspace.c
diff --git a/‎simple_demo.c ‎tests/simple_demo.c b/‎simple_demo.c ‎tests/simple_demo.c
diff --git a/‎test.c ‎tests/test.c b/‎test.c ‎tests/test.c
diff --git a/‎test_knowngood.txt ‎tests/test_knowngood.txt b/‎test_knowngood.txt ‎tests/test_knowngood.txt
diff --git a/‎test_testing.txt ‎tests/test_testing.txt b/‎test_testing.txt ‎tests/test_testing.txt
diff --git a/‎texts.h ‎tests/texts.h b/‎texts.h ‎tests/texts.h
@@ -41,6 +41,8 @@ CFLAGS += -g
 #CFLAGS += -g -fprofile-arcs -ftest-coverage
 #LDFLAGS += -fprofile-arcs -ftest-coverage
 
+CFLAGS += -Iinclude
+
 #always use this: C99, and check source code carefully
 CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wpointer-arith -Wstrict-prototypes
 #well, pretty carefully
@@ -61,7 +63,7 @@ CFLAGS += -Wno-sign-compare -Wno-overlength-strings
 #tell us when denying an inline request
 #CFLAGS += -Winline
 
-LIBHDRS =					\
+LIBHDR_FILES =					\
 crm114_lib.h					\
 crm114_sysincludes.h				\
 crm114_config.h					\
@@ -77,7 +79,9 @@ crm114_matrix_util.h				\
 crm114_svm_quad_prog.h				\
 crm114_datalib.h
 
-LIBOBJS =					\
+LIBHDRS = $(foreach hdr, $(LIBHDR_FILES), include/$(hdr))
+
+LIBOBJ_FILES =					\
 crm114_base.o					\
 crm114_markov.o					\
 crm114_markov_microgroom.o			\
@@ -97,36 +101,38 @@ crm114_strnhash.o				\
 crm114_util.o					\
 crm114_regex_tre.o
 
+LIBOBJS = $(foreach obj, $(LIBOBJ_FILES), lib/$(obj))
 
-all: test simple_demo
+LIB = lib/libcrm114.a
 
-test: test.o libcrm114.a
-	$(CC) -o test $(LDFLAGS) -Wl,-M -Wl,--cref test.o libcrm114.a -ltre -lm >test.map
+all: $(LIB) tests/test tests/simple_demo
 
-test.o: texts.h $(LIBHDRS)
+$(LIBOBJS): $(LIBHDRS) Makefile
 
-simple_demo: simple_demo.o libcrm114.a
-	$(CC) -o simple_demo $(LDFLAGS) -Wl,-M -Wl,--cref simple_demo.o libcrm114.a -ltre -lm >simple_demo.map
+# #ar cmd below has no s modifier (like ranlib).  Not needed now, partly
+# #because LIBOBJS is in the right order.
+$(LIB): $(LIBOBJS) Makefile
+	ar rc $@ $(LIBOBJS)
 
-simple_demo.o: texts.h $(LIBHDRS)
+lib/%.o: lib/%.c
+	$(CC) -c $(CFLAGS) -o $@ $<
 
-#ar cmd below has no s modifier (like ranlib).  Not needed now, partly
-#because LIBOBJS is in the right order.
-libcrm114.a: $(LIBOBJS) Makefile
-	ar rc libcrm114.a $(LIBOBJS)
+tests/test: tests/test.c tests/texts.h $(LIBHDRS)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) -Wl,-M -Wl,--cref $< $(LIB) -ltre -lm >tests/test.map
 
-$(LIBOBJS): $(LIBHDRS)
+tests/simple_demo: tests/simple_demo.c tests/texts.h
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) -Wl,-M -Wl,--cref $< $(LIB) -ltre -lm >tests/simple_demo.map
 
 clean: clean_test clean_simple_demo clean_lib clean_profiling
 
 clean_test:
-	rm -f test test.map test.o
+	rm -f tests/test tests/test.map tests/test.o
 
 clean_simple_demo:
-	rm -f simple_demo simple_demo.map simple_demo.o simple_demo_datablock.txt
+	rm -f tests/simple_demo tests/simple_demo.map tests/simple_demo.o {,tests/}simple_demo_datablock.txt
 
 clean_lib:
-	rm -f libcrm114.a $(LIBOBJS)
+	rm -f $(LIB) $(LIBOBJS)
 
 clean_profiling:
-	rm -f gmon.out *.gcov *.gcno *.gcda
+	rm -f gmon.out *.gcov {,lib/}*.gcno {,lib/}*.gcda