Rename cmd/app -> cli

3 files changed, 25 insertions, 25 deletions

diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in
index 4eb4b0fe6..d68db271c 100644
--- a/src/build-data/makefile/gmake.in
+++ b/src/build-data/makefile/gmake.in
@@ -3,7 +3,7 @@
 %{gmake_commands_in}
 
 # Executable targets
-APP           = %{out_dir}/botan%{program_suffix}
+CLI           = %{out_dir}/botan%{program_suffix}
 TEST          = %{out_dir}/botan-test%{program_suffix}
 
 # Library targets
@@ -16,26 +16,26 @@ INCLUDE_DIR   = %{botan_include_dir}
 
 LIBOBJS       = %{lib_objs}
 
-APPOBJS       = %{app_objs}
+CLIOBJS       = %{cli_objs}
 
 TESTOBJS      = %{test_objs}
 
 # First make target. Will be used by default
-all: $(APP) $(TEST)
+all: $(CLI) $(TEST)
 
 # Build Commands
 %{lib_build_cmds}
 
-%{app_build_cmds}
+%{cli_build_cmds}
 
 %{test_build_cmds}
 
 # Link Commands
 %{gmake_dso_in}
 
-$(APP): $(LIBRARIES) $(APPOBJS)
-	$(APP_LINK_CMD) $(LDFLAGS) $(APPOBJS) -L%{out_dir} -l%{libname} $(APP_LINKS_TO) -o $(APP)
-	$(APP_POST_LINK_CMD)
+$(CLI): $(LIBRARIES) $(CLIOBJS)
+	$(CLI_LINK_CMD) $(LDFLAGS) $(CLIOBJS) -L%{out_dir} -l%{libname} $(CLI_LINKS_TO) -o $(CLI)
+	$(CLI_POST_LINK_CMD)
 
 $(TEST): $(LIBRARIES) $(TESTOBJS)
 	$(TEST_LINK_CMD) $(LDFLAGS) $(TESTOBJS) -L%{out_dir} -l%{libname} $(TEST_LINKS_TO) -o $(TEST)
@@ -57,9 +57,9 @@ SPHINX_OPTS = -b html
 clean:
 	-$(RM) %{libobj_dir}/*
 	-$(RM) %{testobj_dir}/*
-	-$(RM) %{appobj_dir}/*
+	-$(RM) %{cliobj_dir}/*
 	-$(RM) $(SONAME) $(SYMLINK)
-	-$(RM) $(LIBRARIES) $(APP) $(TEST)
+	-$(RM) $(LIBRARIES) $(CLI) $(TEST)
 
 distclean: clean
 	$(RM) Makefile
@@ -72,5 +72,5 @@ valgrind:
 docs:
 %{build_doc_commands}
 
-install: $(APP) docs
+install: $(CLI) docs
 	$(SCRIPTS_DIR)/install.py --destdir=%{destdir} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir}
diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in
index eaf4b511d..6e432440c 100644
--- a/src/build-data/makefile/header.in
+++ b/src/build-data/makefile/header.in
@@ -7,18 +7,18 @@ WARN_FLAGS     = %{cc_warning_flags}
 SO_OBJ_FLAGS   = %{shared_flags}
 
 LIB_LINK_CMD   = %{lib_link_cmd}
-APP_LINK_CMD   = %{app_link_cmd}
+CLI_LINK_CMD   = %{cli_link_cmd}
 TEST_LINK_CMD  = %{test_link_cmd}
 
 LIB_LINKS_TO   = %{link_to}
-APP_LINKS_TO   = $(LIB_LINKS_TO)
+CLI_LINKS_TO   = $(LIB_LINKS_TO)
 TEST_LINKS_TO  = $(LIB_LINKS_TO)
 
 LIB_FLAGS      = $(SO_OBJ_FLAGS) $(CXXFLAGS) $(WARN_FLAGS)
-APP_FLAGS      = $(CXXFLAGS) $(WARN_FLAGS)
+CLI_FLAGS      = $(CXXFLAGS) $(WARN_FLAGS)
 TEST_FLAGS     = $(CXXFLAGS) $(WARN_FLAGS)
 
 SCRIPTS_DIR    = %{scripts_dir}
 
-APP_POST_LINK_CMD  = %{app_post_link_cmd}
+CLI_POST_LINK_CMD  = %{cli_post_link_cmd}
 TEST_POST_LINK_CMD = %{test_post_link_cmd}
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index 88188071b..119e91849 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -14,7 +14,7 @@ RM_R          = $(RM) /S
 RMDIR         = @rmdir
 
 # Executable targets
-APP           = %{out_dir}\botan%{program_suffix}
+CLI           = %{out_dir}\botan%{program_suffix}
 TEST          = %{out_dir}\botan-test%{program_suffix}
 
 # Library targets
@@ -37,24 +37,24 @@ LIBRARIES     = $(SO_FILENAME)
 # File Lists
 LIBOBJS       = %{lib_objs}
 
-APPOBJS       = %{app_objs}
+CLIOBJS       = %{cli_objs}
 
 TESTOBJS      = %{test_objs}
 
 # First make target. Will be used by default
-all: $(APP) $(TEST)
+all: $(CLI) $(TEST)
 
 # Build Commands
 %{lib_build_cmds}
 
-%{app_build_cmds}
+%{cli_build_cmds}
 
 %{test_build_cmds}
 
 # Link Commands
-$(APP): $(LIBRARIES) $(APPOBJS)
-	$(APP_LINK_CMD) /OUT:$@ $(APPOBJS) $(LIB_FILENAME) $(APP_LINKS_TO)
-	$(APP_POST_LINK_CMD)
+$(CLI): $(LIBRARIES) $(CLIOBJS)
+	$(CLI_LINK_CMD) /OUT:$@ $(CLIOBJS) $(LIB_FILENAME) $(CLI_LINKS_TO)
+	$(CLI_POST_LINK_CMD)
 
 $(TEST): $(LIBRARIES) $(TESTOBJS)
 	$(TEST_LINK_CMD) /OUT:$@ $(TESTOBJS) $(LIB_FILENAME) $(TEST_LINKS_TO)
@@ -81,12 +81,12 @@ docs:
 
 clean:
 	-$(RM) %{libobj_dir}\*
+	-$(RM) %{cliobj_dir}\*
 	-$(RM) %{testobj_dir}\*
-	-$(RM) %{appobj_dir}\*
 	-$(RM) %{out_dir}\*.manifest
 	-$(RM) %{out_dir}\*.exp
 	-$(RM) %{out_dir}\*.dll
-	-$(RM) $(LIBRARIES) $(APP) $(TEST)
+	-$(RM) $(LIBRARIES) $(CLI) $(TEST)
 
 distclean: clean
 	$(RM_R) %{build_dir}
@@ -95,7 +95,7 @@ distclean: clean
 	$(RMDIR) %{build_dir}\include
 	$(RMDIR) %{build_dir}\lib %{build_dir}\tests
 	$(RMDIR) %{build_dir}
-	$(RM) Makefile $(LIB_BASENAME).* $(APP).*
+	$(RM) Makefile $(LIB_BASENAME).* $(CLI).*
 
-install: $(APP) docs
+install: $(CLI) docs
 	$(SCRIPTS_DIR)\install.py --destdir=%{destdir} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir}