diff options
| author | midipix <writeonce@midipix.org> | 2016-04-24 19:22:44 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-04-24 19:29:34 -0400 |
| commit | e39fca3756d1480bd0304b5c9135705629fd0630 (patch) | |
| tree | 067aae6accd63ffcaafae1678a7800ff662f4212 | |
| parent | 9f24d2dbde9818a5533b51dc329bfe5d018a3ddc (diff) | |
| download | slibtool-e39fca3756d1480bd0304b5c9135705629fd0630.tar.bz2 slibtool-e39fca3756d1480bd0304b5c9135705629fd0630.tar.xz | |
utility: integrated slbt_source_version().
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | src/slibtool.c | 13 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index d8ae066..abf9377 100644 --- a/Makefile.in +++ b/Makefile.in @@ -83,7 +83,6 @@ include $(PROJECT_DIR)/project/overrides.mk -$(APP_SRCS:%.c=%.o): version.tag $(APP_SRCS:%.c=%.o): CFLAGS_STATIC = $(CFLAGS_APP) src/%.lo: $(PROJECT_DIR)/src/%.c $(ALL_HEADERS) host.tag dirs.tag version.tag diff --git a/src/slibtool.c b/src/slibtool.c index 179165a..e3bf2bb 100644 --- a/src/slibtool.c +++ b/src/slibtool.c @@ -8,7 +8,6 @@ #include <unistd.h> #include <string.h> #include <slibtool/slibtool.h> -#include "slibtool_version.h" #include "slibtool_driver_impl.h" #ifndef SLBT_DRIVER_FLAGS @@ -16,11 +15,19 @@ | SLBT_DRIVER_VERBOSITY_USAGE #endif -static const char vermsg[] = "%s (git://midipix.org/slibtool): commit %s.\n"; +static const char vermsg[] = "%s (git://midipix.org/slibtool): " + "version %d.%d.%d.\n" + "[commit reference: %s]\n"; static ssize_t slibtool_version(struct slbt_driver_ctx * dctx) { - return fprintf(stdout,vermsg,dctx->program,SLIBTOOL_GIT_VERSION); + const struct slbt_source_version * verinfo; + + verinfo = slbt_source_version(); + + return fprintf(stdout,vermsg,dctx->program, + verinfo->major,verinfo->minor,verinfo->revision, + verinfo->commit); } static void slibtool_perform_driver_actions(struct slbt_driver_ctx * dctx) |