Update build system
This commit is contained in:
parent
d910e88bc3
commit
7a5f30bfcd
22 changed files with 40 additions and 61 deletions
|
|
@ -39,5 +39,4 @@ then
|
|||
docs_BUILT=1
|
||||
fi
|
||||
|
||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||
|
|
|
|||
|
|
@ -17,5 +17,4 @@ do
|
|||
done
|
||||
|
||||
print_success "Documentation installed"
|
||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||
|
|
|
|||
|
|
@ -3,12 +3,11 @@
|
|||
# isodate_BUILT
|
||||
#
|
||||
|
||||
build_target libiso8601
|
||||
|
||||
if [ -z ${isodate_BUILT} ]
|
||||
then
|
||||
isodate="obj/isodate"
|
||||
EXTRAS="${libiso8601} ${libiso8601_DEP_CFLAGS} ${libiso8601_DEP_LIBS}"
|
||||
EXTRAS="-std=gnu99 -D_GNU_SOURCE -DAPP_NAME=\"isodate\" \
|
||||
${libiso8601} ${libiso8601_DEP_CFLAGS} ${libiso8601_DEP_LIBS}"
|
||||
|
||||
echo "Building application ${isodate}..."
|
||||
|
||||
|
|
@ -39,5 +38,4 @@ then
|
|||
|
||||
fi
|
||||
|
||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||
|
|
|
|||
|
|
@ -8,5 +8,4 @@ echo "Installing binaries into '${BINDIR}'"
|
|||
install_file "${isodate}" "${BINDIR}" 0755 || return 1
|
||||
print_success "Done"
|
||||
|
||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||
|
|
|
|||
|
|
@ -14,5 +14,4 @@ then
|
|||
MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
|
||||
fi
|
||||
|
||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||
|
|
|
|||
|
|
@ -34,5 +34,4 @@ do_cmd_redir "${CONFFILE}" sed \
|
|||
do_cmd chmod 0755 "${CONFFILE}"
|
||||
print_success "Done"
|
||||
|
||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||
|
|
|
|||
|
|
@ -14,7 +14,9 @@ then
|
|||
libiso8601="obj/${libiso8601_BASE}.so.${SOMAJOR}.${SOMICRO}"
|
||||
libiso8601_DEP_CFLAGS=""
|
||||
libiso8601_DEP_LIBS="-lrt"
|
||||
SO_EXTRA="-std=gnu99 -D_GNU_SOURCE -DDEFAULT_LEAP_TABLE=\"${DEFAULT_LEAP_TABLE}\" ${libiso8601_DEP_CFLAGS} ${libiso8601_DEP_LIBS} -lc"
|
||||
SO_EXTRA="${libiso8601_DEP_CFLAGS} ${libiso8601_DEP_LIBS} -lc \
|
||||
-D_GNU_SOURCE -std=gnu99 \
|
||||
-DDEFAULT_LEAP_TABLE=\"${DEFAULT_LEAP_TABLE}\""
|
||||
|
||||
echo "Building library ${libiso8601}..."
|
||||
|
||||
|
|
@ -52,5 +54,4 @@ then
|
|||
libiso8601_HEADER=${HDR}
|
||||
|
||||
fi
|
||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||
|
|
|
|||
|
|
@ -17,5 +17,4 @@ then
|
|||
libiso8601_MONOLITHIC=1
|
||||
MONOLITHIC_DOC="${MONOLITHIC_DOC} ${HDR}"
|
||||
fi
|
||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||
|
|
|
|||
|
|
@ -95,4 +95,3 @@ true
|
|||
|
||||
|
||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# libiso8601/src/libiso8601/soversion
|
||||
#
|
||||
# (c)2007, Laurence Withers, <l@lwithers.me.uk>.
|
||||
# Released under the GNU GPLv3. See file COPYING or
|
||||
# http://www.gnu.org/copyleft/gpl.html for details.
|
||||
# Copyright: ©2007–2011, Güralp Systems Ltd.
|
||||
# Author: Laurence Withers <lwithers@guralp.com>
|
||||
# License: GPLv3
|
||||
#
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,12 +3,11 @@
|
|||
# setisodate_BUILT
|
||||
#
|
||||
|
||||
build_target libiso8601
|
||||
|
||||
if [ -z ${setisodate_BUILT} ]
|
||||
then
|
||||
setisodate="obj/setisodate"
|
||||
EXTRAS="${libiso8601} ${libiso8601_DEP_CFLAGS} ${libiso8601_DEP_LIBS}"
|
||||
EXTRAS="-std=gnu99 -D_GNU_SOURCE -DAPP_NAME=\"setisodate\" \
|
||||
${libiso8601} ${libiso8601_DEP_CFLAGS} ${libiso8601_DEP_LIBS}"
|
||||
|
||||
echo "Building application ${setisodate}..."
|
||||
|
||||
|
|
@ -39,5 +38,4 @@ then
|
|||
|
||||
fi
|
||||
|
||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||
|
|
|
|||
|
|
@ -8,5 +8,4 @@ echo "Installing binaries into '${SBINDIR}'"
|
|||
install_file "${setisodate}" "${SBINDIR}" 0755 || return 1
|
||||
print_success "Done"
|
||||
|
||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||
|
|
|
|||
|
|
@ -14,5 +14,4 @@ then
|
|||
MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
|
||||
fi
|
||||
|
||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||
|
|
|
|||
|
|
@ -1,3 +1 @@
|
|||
source src/tests/build.tests
|
||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ build_target libiso8601 || return 1
|
|||
if [ -z ${tests_BUILT} ]
|
||||
then
|
||||
LIBS="${libiso8601} ${libiso8601_DEP_CFLAGS} ${libiso8601_DEP_LIBS} "
|
||||
EXTRAS="-D_GNU_SOURCE"
|
||||
EXTRAS="-lm"
|
||||
|
||||
echo "Building test programs..."
|
||||
do_cmd mkdir -p obj/tests || return 1
|
||||
|
|
@ -25,14 +25,9 @@ then
|
|||
fi
|
||||
done
|
||||
|
||||
case "${TEST}" in
|
||||
obj/tests/manip) TEST_EXTRAS="-lm" ;;
|
||||
*) TEST_EXTRAS="" ;;
|
||||
esac
|
||||
|
||||
if [ ${MODIFIED} -ne 0 ]
|
||||
then
|
||||
do_cmd ${CC} -Iobj ${CFLAGS} -o ${TEST} ${SRC} ${LIBS} ${EXTRAS} ${TEST_EXTRAS} || return 1
|
||||
do_cmd ${CC} -Iobj ${CFLAGS} -o ${TEST} ${SRC} ${LIBS} ${EXTRAS} || return 1
|
||||
print_success "Built ${TEST}"
|
||||
else
|
||||
print_success "${TEST} is up to date"
|
||||
|
|
@ -44,5 +39,4 @@ then
|
|||
tests_BUILT=1
|
||||
fi
|
||||
|
||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
/* libiso8601/src/tests/???.c
|
||||
/* libiso8601/src/tests/xxx.c
|
||||
*
|
||||
* (c)2007, Laurence Withers, <l@lwithers.me.uk>.
|
||||
* Released under the GNU GPLv3. See file COPYING or
|
||||
* http://www.gnu.org/copyleft/gpl.html for details.
|
||||
*/
|
||||
* Copyright: ©2007–2011, Güralp Systems Ltd.
|
||||
* Author: Laurence Withers <lwithers@guralp.com>
|
||||
* License: GPLv3
|
||||
*/
|
||||
|
||||
#include "iso8601.h"
|
||||
|
||||
|
|
@ -12,7 +12,8 @@
|
|||
|
||||
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
int
|
||||
main(int argc, char* argv[])
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
|
|
@ -30,7 +31,8 @@ int main(int argc, char* argv[])
|
|||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* options for text editors
|
||||
kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||
vim: expandtab:ts=4:sw=4
|
||||
*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue