[Tinyos-2-commits] CVS: tinyos-2.x/tools/platforms/msp430/cppbsl/src Serial.cc, 1.2, 1.3 Makefile.in, 1.2, 1.3

akoepke andreaskoepke at users.sourceforge.net
Fri Aug 1 10:31:03 PDT 2008


Update of /cvsroot/tinyos/tinyos-2.x/tools/platforms/msp430/cppbsl/src
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4299/src

Modified Files:
	Serial.cc Makefile.in 
Log Message:
account for bug fix in newer Linux Kernels


Index: Serial.cc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/platforms/msp430/cppbsl/src/Serial.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Serial.cc	1 Nov 2007 19:20:37 -0000	1.2
--- Serial.cc	1 Aug 2008 17:30:23 -0000	1.3
***************
*** 34,37 ****
--- 34,44 ----
  #include <stdio.h>
  #include <iostream>
+ #include "../config.h"
+ #ifdef HAVE_LINUX_VERSION_H
+ #include <linux/version.h>
+ #else
+ #define LINUX_VERSION_CODE 1
+ #define KERNEL_VERSION 3
+ #endif
  
  #include "Serial.h"
***************
*** 84,87 ****
--- 91,95 ----
      }
      /* prepare attributes */
+ #if defined(HAVE_LINUX_VERSION_H) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
      r = tcgetattr(*writeFD, &my_tios);
      if(r == -1) {
***************
*** 128,132 ****
          return -1;        
      }
! 
      // clear buffers
      r = tcflush(*writeFD, TCIOFLUSH);
--- 136,163 ----
          return -1;        
      }
! #else
!     r = tcgetattr(*writeFD, &my_tios);
!     if(r == -1) {
!         *err = errno;
!         close(*readFD);
!         close(*writeFD);
!         return -1;
!     }
!     *pt = my_tios;
!     cfmakeraw(&my_tios);
!     my_tios.c_iflag |= IGNBRK | INPCK;
!     my_tios.c_cflag |= (CS8 | CLOCAL | CREAD | PARENB);
!     cfsetispeed(&my_tios, B9600);
!     cfsetospeed(&my_tios, B9600);
!     r = tcsetattr(*readFD, TCSANOW, &my_tios);
!     if(r == -1) {
!         *err = errno;
!         r = tcsetattr(*writeFD, TCSANOW, pt);
!         close(*readFD);
!         close(*writeFD);
!         return -1;        
!     }
! #endif
!     
      // clear buffers
      r = tcflush(*writeFD, TCIOFLUSH);
***************
*** 345,350 ****
  
  int BaseSerial::highSpeed(int *err) {
      struct serial_struct serinfo;
!     int r = ioctl(serialWriteFD, TIOCGSERIAL, &serinfo);
      if(r == -1) {
          *err = errno;
--- 376,383 ----
  
  int BaseSerial::highSpeed(int *err) {
+     int r;
+ #if defined(HAVE_LINUX_VERSION_H) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
      struct serial_struct serinfo;
!     r = ioctl(serialWriteFD, TIOCGSERIAL, &serinfo);
      if(r == -1) {
          *err = errno;
***************
*** 356,359 ****
--- 389,405 ----
      serinfo.flags |= ASYNC_SPD_CUST;
      r = ioctl(serialWriteFD, TIOCSSERIAL, &serinfo);
+ #else
+     struct termios my_tios;
+     r = tcgetattr(serialWriteFD, &my_tios);
+     cfsetispeed(&my_tios, B38400); 
+     cfsetospeed(&my_tios, B38400);
+     r = tcsetattr(serialReadFD, TCSANOW, &my_tios);
+     if(r == -1) {
+         *err = errno;
+     }
+     else {
+         r = tcsetattr(serialWriteFD, TCSANOW, &my_tios);
+     }
+ #endif    
      if(r == -1) {
          *err = errno;

Index: Makefile.in
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/platforms/msp430/cppbsl/src/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.in	5 Nov 2007 18:07:23 -0000	1.2
--- Makefile.in	1 Aug 2008 17:30:23 -0000	1.3
***************
*** 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,
***************
*** 15,29 ****
  @SET_MAKE@
  
- SOURCES = $(cppbsl_SOURCES)
- 
- 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
--- 15,23 ----
***************
*** 44,48 ****
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
! mkinstalldirs = $(mkdir_p)
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
--- 38,42 ----
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
! mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
***************
*** 54,62 ****
  cppbsl_OBJECTS = $(am_cppbsl_OBJECTS)
  cppbsl_LDADD = $(LDADD)
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/Bsl.Po ./$(DEPDIR)/Parameters.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/Serial.Po ./$(DEPDIR)/cppbsl.Po
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--- 48,54 ----
  cppbsl_OBJECTS = $(am_cppbsl_OBJECTS)
  cppbsl_LDADD = $(LDADD)
! DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
***************
*** 74,79 ****
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
  AUTOCONF = @AUTOCONF@
--- 66,69 ----
***************
*** 97,100 ****
--- 87,92 ----
  EGREP = @EGREP@
  EXEEXT = @EXEEXT@
+ GREP = @GREP@
+ INSTALL = @INSTALL@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
***************
*** 106,109 ****
--- 98,102 ----
  LTLIBOBJS = @LTLIBOBJS@
  MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
  OBJEXT = @OBJEXT@
  PACKAGE = @PACKAGE@
***************
*** 118,136 ****
  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@
--- 111,135 ----
  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@
***************
*** 138,151 ****
--- 137,156 ----
  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 = Makefile.in
  cppbsl_SOURCES = \
***************
*** 193,197 ****
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
! 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
  	@list='$(bin_PROGRAMS)'; for p in $$list; do \
  	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
--- 198,202 ----
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
! 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
  	@list='$(bin_PROGRAMS)'; for p in $$list; do \
  	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
***************
*** 216,220 ****
  cppbsl$(EXEEXT): $(cppbsl_OBJECTS) $(cppbsl_DEPENDENCIES) 
  	@rm -f cppbsl$(EXEEXT)
! 	$(CXXLINK) $(cppbsl_LDFLAGS) $(cppbsl_OBJECTS) $(cppbsl_LDADD) $(LIBS)
  
  mostlyclean-compile:
--- 221,225 ----
  cppbsl$(EXEEXT): $(cppbsl_OBJECTS) $(cppbsl_DEPENDENCIES) 
  	@rm -f cppbsl$(EXEEXT)
! 	$(CXXLINK) $(cppbsl_OBJECTS) $(cppbsl_LDADD) $(LIBS)
  
  mostlyclean-compile:
***************
*** 230,248 ****
  
  .cc.o:
! @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
! @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
! @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
! @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
- uninstall-info-am:
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
--- 235,250 ----
  
  .cc.o:
! @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
! @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
! @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
! @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
***************
*** 251,256 ****
  	    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
--- 253,258 ----
  	    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
***************
*** 264,283 ****
  	    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:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
  	tags=; \
- 	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(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) \
--- 266,286 ----
  	    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:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
  	tags=; \
  	list='$(SOURCES) $(HEADERS)  $(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) \
***************
*** 293,312 ****
  
  distdir: $(DISTFILES)
! 	@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; \
--- 296,314 ----
  
  distdir: $(DISTFILES)
! 	@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; \
***************
*** 324,328 ****
  installdirs:
  	for dir in "$(DESTDIR)$(bindir)"; do \
! 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
  	done
  install: install-am
--- 326,330 ----
  installdirs:
  	for dir in "$(DESTDIR)$(bindir)"; do \
! 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-am
***************
*** 345,349 ****
  
  distclean-generic:
! 	-rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
--- 347,351 ----
  
  distclean-generic:
! 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
***************
*** 373,382 ****
--- 375,392 ----
  install-data-am:
  
+ install-dvi: install-dvi-am
+ 
  install-exec-am: install-binPROGRAMS
  
+ install-html: install-html-am
+ 
  install-info: install-info-am
  
  install-man:
  
+ install-pdf: install-pdf-am
+ 
+ install-ps: install-ps-am
+ 
  installcheck-am:
  
***************
*** 398,402 ****
  ps-am:
  
! uninstall-am: uninstall-binPROGRAMS uninstall-info-am
  
  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
--- 408,414 ----
  ps-am:
  
! uninstall-am: uninstall-binPROGRAMS
! 
! .MAKE: install-am install-strip
  
  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
***************
*** 404,413 ****
  	distclean-generic distclean-tags distdir dvi dvi-am html \
  	html-am info info-am install install-am install-binPROGRAMS \
! 	install-data install-data-am install-exec install-exec-am \
! 	install-info install-info-am install-man install-strip \
  	installcheck installcheck-am installdirs maintainer-clean \
  	maintainer-clean-generic mostlyclean mostlyclean-compile \
  	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
! 	uninstall-am uninstall-binPROGRAMS uninstall-info-am
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 416,427 ----
  	distclean-generic distclean-tags distdir dvi dvi-am html \
  	html-am info info-am install install-am install-binPROGRAMS \
! 	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 maintainer-clean \
  	maintainer-clean-generic mostlyclean mostlyclean-compile \
  	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
! 	uninstall-am uninstall-binPROGRAMS
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.



More information about the Tinyos-2-commits mailing list