[Tinyos-2-commits] CVS: tinyos-2.x/tools/platforms/msp430/cppbsl configure.in, 1.2, 1.3 configure, 1.2, 1.3 config.h.in, 1.2, 1.3 aclocal.m4, 1.1, 1.2 Makefile.in, 1.1, 1.2
akoepke
andreaskoepke at users.sourceforge.net
Fri Aug 1 10:30:37 PDT 2008
Update of /cvsroot/tinyos/tinyos-2.x/tools/platforms/msp430/cppbsl
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4299
Modified Files:
configure.in configure config.h.in aclocal.m4 Makefile.in
Log Message:
account for bug fix in newer Linux Kernels
Index: configure.in
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/platforms/msp430/cppbsl/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure.in 5 Nov 2007 18:03:21 -0000 1.2
--- configure.in 1 Aug 2008 17:30:32 -0000 1.3
***************
*** 13,30 ****
AC_PROG_CPP
AC_PROG_CXX
AC_FUNC_ERROR_AT_LINE
AC_HEADER_STDC
! AC_C_CONST
#checks for header files and libraries
! #AC_CHECK_HEADER(readline.h)
! #AC_CHECK_LIB(readline, rl_initialize)
! AC_CHECK_HEADER(popt.h)
AC_CHECK_LIB(popt, poptGetNextOpt)
- #AC_CHECK_HEADER(pthread.h)
# Checks for typedefs, structures, and compiler characteristics.
! # AC_HEADER_STDBOOL
AC_DEFUN([ACX_PTHREAD], [
--- 13,35 ----
AC_PROG_CPP
AC_PROG_CXX
+ AC_PROG_GCC_TRADITIONAL
AC_FUNC_ERROR_AT_LINE
AC_HEADER_STDC
! AC_HEADER_STDBOOL
! AC_HEADER_TIME
#checks for header files and libraries
! AC_CHECK_HEADERS([linux/version.h popt.h fcntl.h inttypes.h stdlib.h sys/ioctl.h sys/time.h termios.h unistd.h])
AC_CHECK_LIB(popt, poptGetNextOpt)
# Checks for typedefs, structures, and compiler characteristics.
! AC_C_CONST
! AC_C_INLINE
! AC_TYPE_UINT16_T
! AC_TYPE_UINT8_T
!
! AC_FUNC_SELECT_ARGTYPES
! AC_CHECK_FUNCS([select strerror])
AC_DEFUN([ACX_PTHREAD], [
Index: configure
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/platforms/msp430/cppbsl/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure 5 Nov 2007 18:03:21 -0000 1.2
--- configure 1 Aug 2008 17:30:32 -0000 1.3
***************
*** 1,9 ****
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.59 for cppbsl 0.1.
#
# Report bugs to <koepke at tkn.tu-berlin.de>.
#
! # Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
--- 1,10 ----
[...9837 lines suppressed...]
***************
*** 5798,5806 ****
done
;;
esac
! done
! _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
{ (exit 0); exit 0; }
--- 7027,7034 ----
done
;;
+
esac
! done # for ac_tag
{ (exit 0); exit 0; }
Index: config.h.in
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/platforms/msp430/cppbsl/config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.h.in 5 Nov 2007 18:07:23 -0000 1.2
--- config.h.in 1 Aug 2008 17:30:32 -0000 1.3
***************
*** 1,4 ****
--- 1,7 ----
/* config.h.in. Generated from configure.in by autoheader. */
+ /* Define to 1 if you have the <fcntl.h> header file. */
+ #undef HAVE_FCNTL_H
+
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
***************
*** 7,13 ****
--- 10,28 ----
#undef HAVE_LIBPOPT
+ /* Define to 1 if you have the <linux/version.h> header file. */
+ #undef HAVE_LINUX_VERSION_H
+
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
+ /* Define to 1 if you have the <popt.h> header file. */
+ #undef HAVE_POPT_H
+
+ /* Define to 1 if you have the `select' function. */
+ #undef HAVE_SELECT
+
+ /* Define to 1 if stdbool.h conforms to C99. */
+ #undef HAVE_STDBOOL_H
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
***************
*** 16,19 ****
--- 31,37 ----
#undef HAVE_STDLIB_H
+ /* Define to 1 if you have the `strerror' function. */
+ #undef HAVE_STRERROR
+
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
***************
*** 22,34 ****
--- 40,70 ----
#undef HAVE_STRING_H
+ /* Define to 1 if you have the <sys/ioctl.h> header file. */
+ #undef HAVE_SYS_IOCTL_H
+
+ /* Define to 1 if you have the <sys/select.h> header file. */
+ #undef HAVE_SYS_SELECT_H
+
+ /* Define to 1 if you have the <sys/socket.h> header file. */
+ #undef HAVE_SYS_SOCKET_H
+
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
+ /* Define to 1 if you have the <sys/time.h> header file. */
+ #undef HAVE_SYS_TIME_H
+
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
+ /* Define to 1 if you have the <termios.h> header file. */
+ #undef HAVE_TERMIOS_H
+
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+ /* Define to 1 if the system has the type `_Bool'. */
+ #undef HAVE__BOOL
+
/* Name of package */
#undef PACKAGE
***************
*** 49,58 ****
--- 85,125 ----
#undef PACKAGE_VERSION
+ /* Define to the type of arg 1 for `select'. */
+ #undef SELECT_TYPE_ARG1
+
+ /* Define to the type of args 2, 3 and 4 for `select'. */
+ #undef SELECT_TYPE_ARG234
+
+ /* Define to the type of arg 5 for `select'. */
+ #undef SELECT_TYPE_ARG5
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
+ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+ #undef TIME_WITH_SYS_TIME
+
/* Version number of package */
#undef VERSION
+ /* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
+ <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
+ #define below would cause a syntax error. */
+ #undef _UINT8_T
+
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
+
+ /* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+ #ifndef __cplusplus
+ #undef inline
+ #endif
+
+ /* Define to the type of an unsigned integer type of width exactly 16 bits if
+ such a type exists and the standard includes do not define it. */
+ #undef uint16_t
+
+ /* Define to the type of an unsigned integer type of width exactly 8 bits if
+ such a type exists and the standard includes do not define it. */
+ #undef uint8_t
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/platforms/msp430/cppbsl/aclocal.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** aclocal.m4 31 Oct 2007 18:54:55 -0000 1.1
--- aclocal.m4 1 Aug 2008 17:30:32 -0000 1.2
***************
*** 1,6 ****
! # generated automatically by aclocal 1.8.3 -*- Autoconf -*-
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
! # Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,6 ----
! # generated automatically by aclocal 1.10.1 -*- Autoconf -*-
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
[...1044 lines suppressed...]
+
+ # tar/untar a dummy directory, and stop if the command works
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
+ rm -rf conftest.dir
+
+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+ AC_SUBST([am__tar])
+ AC_SUBST([am__untar])
+ ]) # _AM_PROG_TAR
+
Index: Makefile.in
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/platforms/msp430/cppbsl/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.in 31 Oct 2007 18:54:55 -0000 1.1
--- Makefile.in 1 Aug 2008 17:30:32 -0000 1.2
***************
*** 1,7 ****
! # Makefile.in generated by automake 1.8.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 14,26 ****
@SET_MAKE@
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
--- 14,22 ----
***************
*** 43,48 ****
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
! configure.lineno configure.status.lineno
! mkinstalldirs = $(mkdir_p)
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
--- 39,44 ----
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
! configure.lineno config.status.lineno
! mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
***************
*** 51,58 ****
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
! install-exec-recursive install-info-recursive \
! install-recursive installcheck-recursive installdirs-recursive \
! pdf-recursive ps-recursive uninstall-info-recursive \
! uninstall-recursive
ETAGS = etags
CTAGS = ctags
--- 47,57 ----
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
! install-dvi-recursive install-exec-recursive \
! install-html-recursive install-info-recursive \
! install-pdf-recursive install-ps-recursive install-recursive \
! installcheck-recursive installdirs-recursive pdf-recursive \
! ps-recursive uninstall-recursive
! RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
! distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
***************
*** 70,75 ****
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
--- 69,72 ----
***************
*** 93,96 ****
--- 90,95 ----
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ GREP = @GREP@
+ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
***************
*** 102,105 ****
--- 101,105 ----
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
***************
*** 114,132 ****
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
- ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build_alias = @build_alias@
datadir = @datadir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
includedir = @includedir@
infodir = @infodir@
--- 114,138 ----
STRIP = @STRIP@
VERSION = @VERSION@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+ builddir = @builddir@
datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
+ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
***************
*** 134,147 ****
--- 140,159 ----
libdir = @libdir@
libexecdir = @libexecdir@
+ localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+ psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in *~
SUBDIRS = config src . #
***************
*** 187,191 ****
@if test ! -f $@; then \
rm -f stamp-h1; \
! $(MAKE) stamp-h1; \
else :; fi
--- 199,203 ----
@if test ! -f $@; then \
rm -f stamp-h1; \
! $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
***************
*** 200,204 ****
distclean-hdr:
-rm -f config.h stamp-h1
- uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
--- 212,215 ----
***************
*** 209,213 ****
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
! @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
--- 220,230 ----
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
! @failcom='exit 1'; \
! for f in x $$MAKEFLAGS; do \
! case $$f in \
! *=* | --[!k]*);; \
! *k*) failcom='fail=yes';; \
! esac; \
! done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
***************
*** 221,225 ****
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
! || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done; \
if test "$$dot_seen" = "no"; then \
--- 238,242 ----
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
! || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
***************
*** 227,233 ****
fi; test -z "$$fail"
! mostlyclean-recursive clean-recursive distclean-recursive \
! maintainer-clean-recursive:
! @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
case "$@" in \
--- 244,255 ----
fi; test -z "$$fail"
! $(RECURSIVE_CLEAN_TARGETS):
! @failcom='exit 1'; \
! for f in x $$MAKEFLAGS; do \
! case $$f in \
! *=* | --[!k]*);; \
! *k*) failcom='fail=yes';; \
! esac; \
! done; \
dot_seen=no; \
case "$@" in \
***************
*** 250,254 ****
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
! || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done && test -z "$$fail"
tags-recursive:
--- 272,276 ----
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
! || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
***************
*** 266,271 ****
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
--- 288,293 ----
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
***************
*** 275,286 ****
tags=; \
here=`pwd`; \
! if (etags --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
else \
include_option=--include; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
! test -f $$subdir/TAGS && \
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
--- 297,310 ----
tags=; \
here=`pwd`; \
! if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
+ empty_fix=.; \
else \
include_option=--include; \
+ empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
! test ! -f $$subdir/TAGS || \
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
***************
*** 290,309 ****
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$tags$$unique" \
! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! $$tags $$unique
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
--- 314,334 ----
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
! if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
! test -n "$$unique" || unique=$$empty_fix; \
! $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! $$tags $$unique; \
! fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
***************
*** 320,340 ****
distdir: $(DISTFILES)
$(am__remove_distdir)
! mkdir $(distdir)
! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! list='$(DISTFILES)'; for file in $$list; do \
! case $$file in \
! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
--- 345,364 ----
distdir: $(DISTFILES)
$(am__remove_distdir)
! test -d $(distdir) || mkdir $(distdir)
! @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
! list='$(DISTFILES)'; \
! dist_files=`for file in $$list; do echo $$file; done | \
! sed -e "s|^$$srcdirstrip/||;t" \
! -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
! case $$dist_files in \
! */*) $(MKDIR_P) `echo "$$dist_files" | \
! sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
! sort -u` ;; \
! esac; \
! for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
***************
*** 347,359 ****
fi; \
done
! list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
! || mkdir "$(distdir)/$$subdir" \
|| exit 1; \
(cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
! top_distdir="../$(top_distdir)" \
! distdir="../$(distdir)/$$subdir" \
distdir) \
|| exit 1; \
--- 371,387 ----
fi; \
done
! list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
! || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
(cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
! top_distdir="$$top_distdir" \
! distdir="$$distdir/$$subdir" \
! am__remove_distdir=: \
! am__skip_length_check=: \
distdir) \
|| exit 1; \
***************
*** 363,378 ****
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
dist-bzip2: distdir
! $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
dist-tarZ: distdir
! $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
--- 391,410 ----
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
! tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
dist-bzip2: distdir
! tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
! $(am__remove_distdir)
!
! dist-lzma: distdir
! tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
dist-tarZ: distdir
! tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
***************
*** 387,391 ****
dist dist-all: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
--- 419,423 ----
dist dist-all: distdir
! tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
***************
*** 396,406 ****
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
*.tar.bz2*) \
! bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
*.tar.Z*) \
! uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
*.shar.gz*) \
! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
--- 428,440 ----
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
! bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
! *.tar.lzma*) \
! unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
! uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
! GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
***************
*** 438,442 ****
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
! sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
--- 472,476 ----
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
! sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
***************
*** 481,485 ****
distclean-generic:
! -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
--- 515,519 ----
distclean-generic:
! -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
***************
*** 508,517 ****
--- 542,559 ----
install-data-am:
+ install-dvi: install-dvi-recursive
+
install-exec-am:
+ install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+ install-pdf: install-pdf-recursive
+
+ install-ps: install-ps-recursive
+
installcheck-am:
***************
*** 534,555 ****
ps-am:
! uninstall-am: uninstall-info-am
! uninstall-info: uninstall-info-recursive
! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
! check-am clean clean-generic clean-recursive ctags \
! ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
! dist-tarZ dist-zip distcheck distclean distclean-generic \
! distclean-hdr distclean-recursive distclean-tags \
! distcleancheck distdir distuninstallcheck dvi dvi-am html \
! html-am info info-am install install-am install-data \
! install-data-am install-exec install-exec-am install-info \
! install-info-am install-man install-strip installcheck \
! installcheck-am installdirs installdirs-am maintainer-clean \
! maintainer-clean-generic maintainer-clean-recursive \
! mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
! pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
! uninstall-info-am
#bin_PROGRAMS=mobfwtest
--- 576,598 ----
ps-am:
! uninstall-am:
! .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
! install-strip
! .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
! all all-am am--refresh check check-am clean clean-generic \
! ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
! dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
! distclean-generic distclean-hdr distclean-tags distcleancheck \
! distdir distuninstallcheck dvi dvi-am html html-am info \
! info-am install install-am install-data install-data-am \
! install-dvi install-dvi-am install-exec install-exec-am \
! install-html install-html-am install-info install-info-am \
! install-man install-pdf install-pdf-am install-ps \
! install-ps-am install-strip installcheck installcheck-am \
! installdirs installdirs-am maintainer-clean \
! maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
! pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
#bin_PROGRAMS=mobfwtest
More information about the Tinyos-2-commits
mailing list