BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Consistently use SR_PACKAGE_VERSION instead of VERSION

This commit is contained in:
Daniel Elstner 2015-08-13 00:38:47 +02:00
parent 27a2497dc2
commit b9eb8e1a8c
11 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bindings/cxx/libsigrokcxx.pc.in
View File

@ -7,8 +7,7 @@ Name: libsigrokcxx
Description: C++ bindings for libsigrok
URL: http://www.sigrok.org
Requires: libsigrok glibmm-2.4
Version: @VERSION@
Version: @SR_PACKAGE_VERSION@
Libs: -L${libdir} -lsigrokcxx
Libs.private: -lm
Cflags: -I${includedir}

2
configure.ac
View File

@ -35,7 +35,7 @@ AC_CONFIG_MACRO_DIR([autostuff])
AC_CONFIG_AUX_DIR([autostuff])
# We require at least automake 1.11 (needed for 'silent rules').
AM_INIT_AUTOMAKE([1.11 -Wall -Werror subdir-objects check-news color-tests])
AM_INIT_AUTOMAKE([1.11 -Wall -Werror no-define subdir-objects check-news color-tests])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])

3
libsigrok.pc.in
View File

@ -8,8 +8,7 @@ Description: Backend library of the sigrok logic analyzer software
URL: http://www.sigrok.org
Requires: glib-2.0
Requires.private: @SR_PKGLIBS@
Version: @VERSION@
Version: @SR_PACKAGE_VERSION@
Libs: -L${libdir} -lsigrok
Libs.private: -lm
Cflags: -I${includedir}

2
src/output/ascii.c
View File

@ -107,7 +107,7 @@ static GString *gen_header(const struct sr_output *o)
}
header = g_string_sized_new(512);
g_string_printf(header, "%s\n", PACKAGE_STRING);
g_string_printf(header, "%s %s\n", PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
num_channels = g_slist_length(o->sdi->channels);
g_string_append_printf(header, "Acquisition with %d/%d channels",
ctx->num_enabled_channels, num_channels);

2
src/output/bits.c
View File

@ -101,7 +101,7 @@ static GString *gen_header(const struct sr_output *o)
}
header = g_string_sized_new(512);
g_string_printf(header, "%s\n", PACKAGE_STRING);
g_string_printf(header, "%s %s\n", PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
num_channels = g_slist_length(o->sdi->channels);
g_string_append_printf(header, "Acquisition with %d/%d channels",
ctx->num_enabled_channels, num_channels);

5
src/output/csv.c
View File

@ -21,7 +21,6 @@
#include <stdlib.h>
#include <string.h>
#include <glib.h>
#include "config.h" /* Needed for PACKAGE_STRING and others. */
#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
@ -118,8 +117,8 @@ static GString *gen_header(const struct sr_output *o)
/* Some metadata */
t = time(NULL);
g_string_append_printf(header, "; CSV, generated by %s on %s",
PACKAGE_STRING, ctime(&t));
g_string_append_printf(header, "; CSV, generated by %s %s on %s",
PACKAGE_NAME, SR_PACKAGE_VERSION_STRING, ctime(&t));
/* Columns / channels */
num_channels = g_slist_length(o->sdi->channels);

5
src/output/gnuplot.c
View File

@ -21,7 +21,6 @@
#include <stdlib.h>
#include <string.h>
#include <glib.h>
#include "config.h" /* Needed for PACKAGE_STRING and others. */
#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
@ -107,8 +106,8 @@ static GString *gen_header(const struct sr_output *o)
t = time(NULL);
header = g_string_sized_new(512);
g_string_printf(header, "%s", gnuplot_header);
g_string_append_printf(header, "# Generated by %s on %s",
PACKAGE_STRING, ctime(&t));
g_string_append_printf(header, "# Generated by %s %s on %s",
PACKAGE_NAME, SR_PACKAGE_VERSION_STRING, ctime(&t));
num_channels = g_slist_length(o->sdi->channels);
g_string_append_printf(header, "# Acquisition with %d/%d channels",

2
src/output/hex.c
View File

@ -106,7 +106,7 @@ static GString *gen_header(const struct sr_output *o)
}
header = g_string_sized_new(512);
g_string_printf(header, "%s\n", PACKAGE_STRING);
g_string_printf(header, "%s %s\n", PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
num_channels = g_slist_length(o->sdi->channels);
g_string_append_printf(header, "Acquisition with %d/%d channels",
ctx->num_enabled_channels, num_channels);

2
src/output/srzip.c
View File

@ -96,7 +96,7 @@ static int zip_create(const struct sr_output *o)
close(tmpfile);
meta = g_fopen(metafile, "wb");
fprintf(meta, "[global]\n");
fprintf(meta, "sigrok version = %s\n", PACKAGE_VERSION);
fprintf(meta, "sigrok version = %s\n", SR_PACKAGE_VERSION_STRING);
fprintf(meta, "[device 1]\ncapturefile = logic-1\n");
fprintf(meta, "total probes = %d\n", g_slist_length(o->sdi->channels));
s = sr_samplerate_string(outc->samplerate);

5
src/output/vcd.c
View File

@ -22,7 +22,6 @@
#include <stdlib.h>
#include <string.h>
#include <glib.h>
#include "config.h" /* Needed for PACKAGE and others. */
#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
@ -104,7 +103,7 @@ static GString *gen_header(const struct sr_output *o)
/* generator */
g_string_append_printf(header, "$version %s %s $end\n",
PACKAGE, PACKAGE_VERSION);
PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
g_string_append_printf(header, "$comment\n Acquisition with "
"%d/%d channels", ctx->num_enabled_channels, num_channels);
@ -135,7 +134,7 @@ static GString *gen_header(const struct sr_output *o)
g_free(frequency_s);
/* scope */
g_string_append_printf(header, "$scope module %s $end\n", PACKAGE);
g_string_append_printf(header, "$scope module %s $end\n", PACKAGE_NAME);
/* Wires / channels */
for (i = 0, l = o->sdi->channels; l; l = l->next, i++) {

3
src/session_file.c
View File

@ -26,7 +26,6 @@
#include <errno.h>
#include <glib.h>
#include <glib/gstdio.h>
#include "config.h" /* Needed for PACKAGE_VERSION and others. */
#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
@ -351,7 +350,7 @@ SR_API int sr_session_save_init(struct sr_session *session,
close(tmpfile);
meta = g_fopen(metafile, "wb");
fprintf(meta, "[global]\n");
fprintf(meta, "sigrok version = %s\n", PACKAGE_VERSION);
fprintf(meta, "sigrok version = %s\n", SR_PACKAGE_VERSION_STRING);
/* metadata */
fprintf(meta, "[device 1]\n");