Rename target

14 files changed, 39 insertions, 39 deletions

diff --git a/src/build-data/cc/bcc.txt b/src/build-data/cc/bcc.txt
index 9a810d7cd..ddb0aa996 100644
--- a/src/build-data/cc/bcc.txt
+++ b/src/build-data/cc/bcc.txt
@@ -10,7 +10,7 @@ add_lib_option ""
 
 no_debug_flags "-O2"
 debug_flags ""
-test_opt_flags "-O2"
+app_opt_flags "-O2"
 lang_flags ""
 warning_flags ""
 
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index 16c7d37f8..43b81cd93 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -15,7 +15,7 @@ warning_flags "-Wextra -Wall"
 makefile_style unix
 
 lib_opt_flags "-O3"
-test_opt_flags "-O2"
+app_opt_flags "-O2"
 shared_flags "-fPIC"
 debug_flags "-g -fno-inline-functions"
 no_debug_flags ""
diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt
index a95093876..80e78ecf8 100644
--- a/src/build-data/cc/ekopath.txt
+++ b/src/build-data/cc/ekopath.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-O3 -OPT:Ofast:alias=disjoint"
-test_opt_flags "-O2"
+app_opt_flags "-O2"
 lang_flags "-D_REENTRANT -ansi -Wno-long-long"
 warning_flags "-W -Wall"
 
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 78f54bd56..fe89512c0 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -13,7 +13,7 @@ maintainer_warning_flags "-Werror -Wno-error=old-style-cast -Wno-error=zero-as-n
 warning_flags "-Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wold-style-cast -Wzero-as-null-pointer-constant"
 
 lib_opt_flags "-O3"
-test_opt_flags "-O2"
+app_opt_flags "-O2"
 shared_flags "-fPIC"
 debug_flags "-g -fno-inline-functions"
 
diff --git a/src/build-data/cc/hpcc.txt b/src/build-data/cc/hpcc.txt
index b3cd58c2f..975b68234 100644
--- a/src/build-data/cc/hpcc.txt
+++ b/src/build-data/cc/hpcc.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "+O2"
-test_opt_flags "+O2"
+app_opt_flags "+O2"
 debug_flags -g
 no_debug_flags ""
 lang_flags "-AA -ext +eh -z"
diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index eac9fc218..fcad09513 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-O2 -ip -unroll"
-test_opt_flags "-O2"
+app_opt_flags "-O2"
 debug_flags -g
 no_debug_flags "-fomit-frame-pointer"
 lang_flags "-std=c++0x"
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
index 4e75d5ba1..93dcdcb50 100644
--- a/src/build-data/cc/msvc.txt
+++ b/src/build-data/cc/msvc.txt
@@ -10,7 +10,7 @@ add_lib_option ""
 
 no_debug_flags "/O2"
 debug_flags "/Od /Zi /DDEBUG"
-test_opt_flags "/O2 /D_CONSOLE"
+app_opt_flags "/O2 /D_CONSOLE"
 lang_flags "/EHs /GR"
 warning_flags "/W3 /wd4275 /wd4267"
 
diff --git a/src/build-data/cc/open64.txt b/src/build-data/cc/open64.txt
index 543d84021..69aee9f10 100644
--- a/src/build-data/cc/open64.txt
+++ b/src/build-data/cc/open64.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-O3 -OPT:alias=TYPED"
-test_opt_flags "-O3 -OPT:alias=TYPED"
+app_opt_flags "-O3 -OPT:alias=TYPED"
 debug_flags "-g3"
 no_debug_flags "-fomit-frame-pointer"
 shared_flags "-fPIC"
diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt
index 6a2f104ff..4a5335a1e 100644
--- a/src/build-data/cc/pgi.txt
+++ b/src/build-data/cc/pgi.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-fast -Minline"
-test_opt_flags "-fast"
+app_opt_flags "-fast"
 shared_flags "-fPIC"
 
 makefile_style unix
diff --git a/src/build-data/cc/sunstudio.txt b/src/build-data/cc/sunstudio.txt
index 75cf1a758..ca280f924 100644
--- a/src/build-data/cc/sunstudio.txt
+++ b/src/build-data/cc/sunstudio.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-xO5"
-test_opt_flags "-xO2"
+app_opt_flags "-xO2"
 debug_flags -g
 no_debug_flags ""
 shared_flags "-KPIC"
diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt
index 73ae91747..3e83691d6 100644
--- a/src/build-data/cc/xlc.txt
+++ b/src/build-data/cc/xlc.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-O2"
-test_opt_flags "-O2"
+app_opt_flags "-O2"
 lang_flags ""
 debug_flags -g
 no_debug_flags ""
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index c14a58d1d..3fbbf8263 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -1,7 +1,7 @@
 ### Compiler Options
 CXX           = %{cc}
 LIB_OPT       = %{lib_opt}
-TEST_OPT      = %{test_opt}
+APP_OPT      = %{app_opt}
 LANG_FLAGS    = %{lang_flags}
 WARN_FLAGS    = %{warn_flags}
 SO_OBJ_FLAGS  = %{shared_flags}
@@ -9,7 +9,7 @@ LIB_LINK_CMD  = %{so_link}
 LINK_TO       = %{link_to}
 
 LIB_FLAGS     = $(LIB_OPT) $(LANG_FLAGS) $(WARN_FLAGS) $(SO_OBJ_FLAGS)
-TEST_FLAGS    = $(TEST_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
+APP_FLAGS    = $(APP_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
 
 ### Version Numbers
 VERSION       = %{version}
@@ -31,13 +31,13 @@ RM_R          = $(RM) /S
 RMDIR         = @rmdir
 
 ### File Lists
-TEST         = test
+APP         = botan
 
 HEADERS       = %{include_files}
 
 LIBOBJS       = %{lib_objs}
 
-TESTOBJS     = %{test_objs}
+APPOBJS     = %{app_objs}
 
 LIBNAME       = botan
 
@@ -46,16 +46,16 @@ LIBRARIES     = $(BOTAN_LIB)
 # This will be either a static lib or the DLL import lib
 BOTAN_LIB     = $(LIBNAME).%{static_suffix}
 
-all: $(TEST)
+all: $(APP)
 
 ### Build Commands
 %{lib_build_cmds}
 
-%{test_build_cmds}
+%{app_build_cmds}
 
 ### Link Commands
-$(TEST): $(LIBRARIES) $(TESTOBJS)
-	$(CXX) /Fe$@ $(TESTOBJS) $(BOTAN_LIB) $(LINK_TO)
+$(APP): $(LIBRARIES) $(APPOBJS)
+	$(CXX) /Fe$@ $(APPOBJS) $(BOTAN_LIB) $(LINK_TO)
 
 $(BOTAN_LIB): $(LIBOBJS)
 !If "$(SO_OBJ_FLAGS)" == ""
@@ -71,7 +71,7 @@ docs:
 clean:
 	$(RM) %{build_dir}\lib\* %{build_dir}\tests\*
 	$(RM) *.manifest *.exp *.dll
-	$(RM) $(LIBRARIES) $(TEST)
+	$(RM) $(LIBRARIES) $(APP)
 
 distclean: clean
 	$(RM_R) %{build_dir}
@@ -80,7 +80,7 @@ distclean: clean
 	$(RMDIR) %{build_dir}\include
 	$(RMDIR) %{build_dir}\lib %{build_dir}\tests
 	$(RMDIR) %{build_dir}
-	$(RM) Makefile $(LIBNAME).* $(TEST).*
+	$(RM) Makefile $(LIBNAME).* $(APP).*
 
 ### Install Commands
 install: $(LIBRARIES)
diff --git a/src/build-data/makefile/unix.in b/src/build-data/makefile/unix.in
index 1f8eaac2d..bdf8a98bf 100644
--- a/src/build-data/makefile/unix.in
+++ b/src/build-data/makefile/unix.in
@@ -1,13 +1,13 @@
 # Compiler Options
 CXX           = %{cc}
 LIB_OPT       = %{lib_opt}
-TEST_OPT     = %{test_opt}
+APP_OPT     = %{app_opt}
 LANG_FLAGS    = %{lang_flags}
 WARN_FLAGS    = %{warn_flags}
 LINK_TO       = %{link_to}
 
 LIB_FLAGS     = $(LANG_FLAGS) $(LIB_OPT) $(WARN_FLAGS)
-TEST_FLAGS   = $(LANG_FLAGS) $(TEST_OPT) $(WARN_FLAGS)
+APP_FLAGS   = $(LANG_FLAGS) $(APP_OPT) $(WARN_FLAGS)
 
 # Version Numbers
 VERSION       = %{version}
@@ -41,13 +41,13 @@ RM               = @rm -f
 RM_R             = @rm -rf
 
 # Targets
-TEST         = %{test_prefix}test
+APP         = %{app_prefix}botan
 LIBRARIES     = $(STATIC_LIB)
 
 LIBNAME       = %{lib_prefix}libbotan
 STATIC_LIB    = $(LIBNAME)-$(SERIES).a
 
-all: $(TEST)
+all: $(APP)
 
 # File Lists
 
@@ -55,16 +55,16 @@ HEADERS       = %{include_files}
 
 LIBOBJS       = %{lib_objs}
 
-TESTOBJS     = %{test_objs}
+APPOBJS     = %{app_objs}
 
 # Build Commands
 %{lib_build_cmds}
 
-%{test_build_cmds}
+%{app_build_cmds}
 
 # Link Commands
-$(TEST): $(LIBRARIES) $(TESTOBJS)
-	$(CXX) $(TESTOBJS) $(STATIC_LIB) $(LINK_TO) -o $(TEST)
+$(APP): $(LIBRARIES) $(APPOBJS)
+	$(CXX) $(APPOBJS) $(STATIC_LIB) $(LINK_TO) -o $(APP)
 
 $(STATIC_LIB): $(LIBOBJS)
 	$(RM) $(STATIC_LIB)
@@ -81,7 +81,7 @@ docs:
 
 clean:
 	$(RM_R) %{build_dir}/lib/* %{build_dir}/tests/*
-	$(RM) $(LIBRARIES) $(SYMLINK) $(TEST)
+	$(RM) $(LIBRARIES) $(SYMLINK) $(APP)
 
 distclean: clean
 	$(RM_R) %{build_dir}
diff --git a/src/build-data/makefile/unix_shr.in b/src/build-data/makefile/unix_shr.in
index 986767fcb..53974c4ff 100644
--- a/src/build-data/makefile/unix_shr.in
+++ b/src/build-data/makefile/unix_shr.in
@@ -1,7 +1,7 @@
 # Compiler Options
 CXX           = %{cc}
 LIB_OPT       = %{lib_opt}
-TEST_OPT      = %{test_opt}
+APP_OPT      = %{app_opt}
 LANG_FLAGS    = %{lang_flags}
 WARN_FLAGS    = %{warn_flags}
 SO_OBJ_FLAGS  = %{shared_flags}
@@ -9,7 +9,7 @@ SO_LINK_CMD   = %{so_link}
 LINK_TO       = %{link_to}
 
 LIB_FLAGS     = $(SO_OBJ_FLAGS) $(LANG_FLAGS) $(LIB_OPT) $(WARN_FLAGS)
-TEST_FLAGS    = $(LANG_FLAGS) $(TEST_OPT) $(WARN_FLAGS)
+APP_FLAGS    = $(LANG_FLAGS) $(APP_OPT) $(WARN_FLAGS)
 
 # Version Numbers
 VERSION       = %{version}
@@ -43,7 +43,7 @@ RM               = @rm -f
 RM_R             = @rm -rf
 
 # Targets
-TEST         = %{test_prefix}test
+APP         = %{app_prefix}botan
 LIBRARIES     = $(STATIC_LIB) $(SHARED_LIB)
 
 LIBNAME       = %{lib_prefix}libbotan
@@ -54,23 +54,23 @@ SHARED_LIB    = $(SONAME).%{version_patch}
 
 SYMLINK       = $(LIBNAME)-$(SERIES).%{so_suffix}
 
-all: $(TEST)
+all: $(APP)
 
 # File Lists
 HEADERS       = %{include_files}
 
 LIBOBJS       = %{lib_objs}
 
-TESTOBJS     = %{test_objs}
+APPOBJS     = %{app_objs}
 
 # Build Commands
 %{lib_build_cmds}
 
-%{test_build_cmds}
+%{app_build_cmds}
 
 # Link Commands
-$(TEST): $(LIBRARIES) $(TESTOBJS)
-	$(CXX) $(LDFLAGS) $(TESTOBJS) $(SHARED_LIB) $(LINK_TO) -lboost_regex -o $(TEST)
+$(APP): $(LIBRARIES) $(APPOBJS)
+	$(CXX) $(LDFLAGS) $(APPOBJS) $(SHARED_LIB) $(LINK_TO) -lboost_regex -o $(APP)
 
 $(STATIC_LIB): $(LIBOBJS)
 	$(RM) $(STATIC_LIB)
@@ -94,7 +94,7 @@ docs:
 
 clean:
 	$(RM_R) %{build_dir}/lib/* %{build_dir}/tests/*
-	$(RM) $(LIBRARIES) $(SYMLINK) $(SONAME) $(TEST)
+	$(RM) $(LIBRARIES) $(SYMLINK) $(SONAME) $(APP)
 
 distclean: clean
 	$(RM_R) %{build_dir}