cake
/
libp7
Archived
1
0
Fork 1

Just added the maintainer in the configuration :)

This commit is contained in:
Thomas Touhey 2017-02-24 02:36:26 +01:00
parent e0b0e5d1af
commit 318790903c
4 changed files with 10 additions and 10 deletions

View File

@ -91,8 +91,6 @@ endif
$(if $(STATIC),-Dis_static,-fPIC) $(if $(OPTIMIZE_SIZE),-Os,-O2) \
$(if $(USE_LIBUSB),,-DP7_DISABLED_LIBUSB) \
-D LOGLEVEL="ll_$(LOG_LEVEL)" -D INIT_TRIES="$(INIT_TRIES)" \
-D MAINTAINER="$(MAINTAINER_NAME) <$(MAINTAINER_MAIL)>" \
-D VERSION="$(VERSION)" \
$(shell $(PKGCONFIG) --cflags $(LIBS) 2>/dev/null) \
$(CMOREFLAGS)

7
configure vendored
View File

@ -238,9 +238,10 @@ fi
make mrproper MAKE_FULL_LOG=y 1>/dev/null 2>/dev/null
# Create the configuration header
opt="--version=${version} "
[ "$no_file" ] && opt+="--no-file "
tools/write-header-config $opt >include/libp7/config.h
tools/write-header-config --version=${version} \
--maintainer="$(echo ${maintainer} | sed 's/"/\\"/g')" \
$([ "$no_file" ] && echo --no-file) \
>include/${name}/config.h
# Do it!
exec 3>&1 1>Makefile.cfg

View File

@ -22,9 +22,6 @@
#ifndef is_static
# include <unistd.h>
# define Q(x) #x
# define QUOTE(x) Q(x)
/* get loglevel string */
# if LOGLEVEL == ll_info
# define LLS "info"
@ -46,8 +43,8 @@
*/
static const char version_message[] =
"libp7 v" QUOTE(VERSION) " (licensed under LGPL3)\n"
"Maintained by " QUOTE(MAINTAINER) ".\n"
"libp7 v" LIBP7_VERSION " (licensed under LGPL3)\n"
"Maintained by " LIBP7_MAINTAINER ".\n"
"\n"
"Compiled with the '" LLS "' loglevel.\n"
"\n"

View File

@ -5,11 +5,13 @@
# Initialize the variables
no_file=
version=
maintainer='anon <anon@localhost>'
# Read the arguments
for arg ; do case "$arg" in
--no-file) no_file=y ;;
--version=*) version="${arg#*=}" ;;
--maintainer=*) maintainer="${arg#*=}" ;;
*) echo "'${arg}': Did not read." >&2 ;;
esac; done
@ -61,6 +63,8 @@ cat <<_EOF
# define LIBP7_MINOR ${version_minor}
# define LIBP7_REV ${version_rev}
# define LIBP7_INDEV ${version_indev}
# define LIBP7_MAINTAINER \\
"${maintainer}"
_EOF