diff options
| author | lloyd <[email protected]> | 2014-01-10 00:08:13 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2014-01-10 00:08:13 +0000 |
| commit | 57789bdfc55061002b2727d0b32587612829a37c (patch) | |
| tree | 99f36631b4ec50c5187a1b0a7c256b99182373ad /src/build-data/makefile/gmake.in | |
| parent | 94968c917407a63d888fd3eb4d02491f60de6ebc (diff) | |
Split up test vectors into per-algo files and app into botan-test for
the tests and botan for everything else.
Diffstat (limited to 'src/build-data/makefile/gmake.in')
| -rw-r--r-- | src/build-data/makefile/gmake.in | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in index b5d14a601..bcaa5b9a0 100644 --- a/src/build-data/makefile/gmake.in +++ b/src/build-data/makefile/gmake.in @@ -6,10 +6,12 @@ LANG_FLAGS = %{lang_flags} WARN_FLAGS = %{warn_flags} SO_OBJ_FLAGS = %{shared_flags} LIB_LINKS_TO = %{link_to} -APP_LINKS_TO = $(LIB_LINKS_TO) -lboost_regex -lboost_thread +APP_LINKS_TO = $(LIB_LINKS_TO) -lboost_thread +TEST_LINKS_TO = $(LIB_LINKS_TO) -lboost_filesystem LIB_FLAGS = $(SO_OBJ_FLAGS) $(LANG_FLAGS) $(LIB_OPT) $(WARN_FLAGS) APP_FLAGS = $(LANG_FLAGS) $(APP_OPT) $(WARN_FLAGS) +TEST_FLAGS = $(LANG_FLAGS) $(APP_OPT) $(WARN_FLAGS) # Version Numbers VERSION = %{version} @@ -44,6 +46,7 @@ RM_R = @rm -rf # Targets APP = %{app_prefix}botan +TEST = %{app_prefix}botan-test LIBRARIES = $(STATIC_LIB) LIBNAME = %{lib_prefix}libbotan @@ -51,7 +54,7 @@ STATIC_LIB = $(LIBNAME)-$(BRANCH).a LIBPATH = botan-$(BRANCH) -all: $(APP) +all: $(APP) $(TEST) # File Lists INCLUDE_DIR = %{botan_include_dir} @@ -60,17 +63,24 @@ LIBOBJS = %{lib_objs} APPOBJS = %{app_objs} +TESTOBJS = %{test_objs} + # Build Commands %{lib_build_cmds} %{app_build_cmds} +%{test_build_cmds} + # Link Commands %{shared_makefile} $(APP): $(LIBRARIES) $(APPOBJS) $(CXX) $(LDFLAGS) $(APPOBJS) -L. -l$(LIBPATH) $(APP_LINKS_TO) -o $(APP) +$(TEST): $(LIBRARIES) $(TESTOBJS) + $(CXX) $(LDFLAGS) $(TESTOBJS) -L. -l$(LIBPATH) $(TEST_LINKS_TO) -o $(TEST) + $(STATIC_LIB): $(LIBOBJS) $(RM) $(STATIC_LIB) $(AR) $(STATIC_LIB) $(LIBOBJS) |