summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-03-20 07:15:27 -0400
committermidipix <writeonce@midipix.org>2016-03-20 07:15:27 -0400
commitfab9866a37788f11e2482ea0d6e7ef165d827d49 (patch)
tree0214a7c6b72aafc5c578429633a5c86d579a37c4
parent731e44c760200063167756aa43c9351561d48a51 (diff)
downloadslibtool-fab9866a37788f11e2482ea0d6e7ef165d827d49.tar.bz2
slibtool-fab9866a37788f11e2482ea0d6e7ef165d827d49.tar.xz
utility: output: added a generic slbt_output_exec() interface.
-rw-r--r--include/slibtool/slibtool.h1
-rw-r--r--project/common.mk2
-rw-r--r--src/output/slbt_output_exec.c (renamed from src/output/slbt_output_compile.c)14
3 files changed, 13 insertions, 4 deletions
diff --git a/include/slibtool/slibtool.h b/include/slibtool/slibtool.h
index e81f00a..a987a40 100644
--- a/include/slibtool/slibtool.h
+++ b/include/slibtool/slibtool.h
@@ -186,6 +186,7 @@ slbt_api int slbt_unmap_input (struct slbt_input *);
/* utility api */
slbt_api int slbt_output_config (const struct slbt_driver_ctx *);
+slbt_api int slbt_output_exec (const struct slbt_driver_ctx *, const struct slbt_exec_ctx *, const char *);
slbt_api int slbt_output_compile (const struct slbt_driver_ctx *, const struct slbt_exec_ctx *);
#ifdef __cplusplus
diff --git a/project/common.mk b/project/common.mk
index 7dd48ba..25fb716 100644
--- a/project/common.mk
+++ b/project/common.mk
@@ -4,8 +4,8 @@ COMMON_SRCS = \
src/logic/slbt_exec_compile.c \
src/logic/slbt_exec_ctx.c \
src/logic/slbt_map_input.c \
- src/output/slbt_output_compile.c \
src/output/slbt_output_config.c \
+ src/output/slbt_output_exec.c \
src/skin/slbt_skin_default.c \
APP_SRCS = \
diff --git a/src/output/slbt_output_compile.c b/src/output/slbt_output_exec.c
index c86148a..62b15cc 100644
--- a/src/output/slbt_output_compile.c
+++ b/src/output/slbt_output_exec.c
@@ -7,13 +7,14 @@
#include <stdio.h>
#include <slibtool/slibtool.h>
-int slbt_output_compile(
+int slbt_output_exec(
const struct slbt_driver_ctx * dctx,
- const struct slbt_exec_ctx * ectx)
+ const struct slbt_exec_ctx * ectx,
+ const char * step)
{
char ** parg;
- if (fprintf(stdout,"%s: compile:",dctx->program) < 0)
+ if (fprintf(stdout,"%s: %s:",dctx->program,step) < 0)
return -1;
for (parg=ectx->argv; *parg; parg++)
@@ -25,3 +26,10 @@ int slbt_output_compile(
return 0;
}
+
+int slbt_output_compile(
+ const struct slbt_driver_ctx * dctx,
+ const struct slbt_exec_ctx * ectx)
+{
+ return slbt_output_exec(dctx,ectx,"compile");
+}