Skip to contentSkip to conversation

iwpan: use autoconf version defines

PATCH New Alexander Aring 1 participant 4 messages Dec 7, 2014 IEEE 802.15.4

lore
Share & tools
lore

Alexander Aring

author maintainer
#0 lore raw

PATCH 1/4 iwpan: use autoconf version defines

This patch use the autoconf VERSION defines instead hardcoded version strings.

Signed-off-by Alexander Aring <[email protected]>
---
 src/iwpan.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
src/iwpan.c +3 -4
index 1e0b162..e988703 100644
@@ -17,6 +17,7 @@
 
 #include "nl802154.h"
 #include "iwpan.h"
+#include "config.h"
 
 /* TODO libnl 1.x compatibility code */
 

@@ -173,8 +174,7 @@ static void usage(int argc, char **argv)
 
 	printf("Usage:\t%s [options] command\n", argv0);
 	usage_options();
-	/* TODO */
-	printf("\t--version\tshow version (0.1)\n");
+	printf("\t--version\tshow version (" PACKAGE_VERSION ")\n");
 	printf("Commands:\n");
 	for_each_cmd(section) {
 		if (section->parent)

@@ -215,8 +215,7 @@ static void usage_cmd(const struct cmd *cmd)
 
 static void version(void)
 {
-	/* TODO */
-	printf("iwpan version 0.1\n");
+	printf("iwpan version " PACKAGE_VERSION "\n");
 }
 
 static int phy_lookup(char *name)
Signature · 1 line
2.1.3
author maintainer
#1 lore raw

PATCH 2/4 configure: fix CFLAGS definition

This patch fix the CFLAGS definition from my_CFLAGS to WPAN_TOOLS_CFLAGS.

Signed-off-by Alexander Aring <[email protected]>
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configure.ac +1 -1
index 9aa6330..16a8b97 100644
@@ -37,7 +37,7 @@ AC_CHECK_FUNCS([ \
 	secure_getenv\
 ])
 
-my_CFLAGS="\
+WPAN_TOOLS_CFLAGS="\
 -Wall \
 -Wchar-subscripts \
 -Wformat-security \
Signature · 1 line
2.1.3
author maintainer
#2 lore raw

PATCH 3/4 configure: change archive generation

In reply to Alexander Aring

This patch changes the archive generation for "make distcheck".

Signed-off-by Alexander Aring <[email protected]>
---
 configure.ac | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
configure.ac +1 -2
index 16a8b97..bb17e08 100644
@@ -12,8 +12,7 @@ AM_INIT_AUTOMAKE([
 	-Wno-portability
 	silent-rules
 	tar-pax
-	no-dist-gzip
-	dist-xz
+	dist-bzip2
 	subdir-objects
 ])
 AC_PROG_CC_STDC
Signature · 1 line
2.1.3
author maintainer
#3 lore raw

PATCH 4/4 configure: version bump

In reply to Alexander Aring

Bump version for release 0.3

Signed-off-by Alexander Aring <[email protected]>
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configure.ac +1 -1
index bb17e08..f0d6f5d 100644
@@ -1,6 +1,6 @@
 AC_PREREQ(2.60)
 AC_INIT([Userspace tools for Linux IEEE 802.15.4 stack],
-	[0.1], [[email protected]], [wpan-tools],
+	[0.3], [[email protected]], [wpan-tools],
 	[https://github.com/linux-wpan/wpan-tools])
 AC_CONFIG_SRCDIR([src/iwpan.c])
 AC_CONFIG_AUX_DIR([build-aux])
Signature · 1 line
2.1.3