[Olsr-cvs] olsrd-current .cvsignore, 1.2, 1.3 Makefile, 1.88, 1.89 Makefile.inc, 1.20, 1.21

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29427

Modified Files:
	.cvsignore Makefile Makefile.inc 
Log Message:
* ignore the generated olsr_switch binary.cvsignore

Index: .cvsignore
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** .cvsignore	5 Feb 2007 21:17:26 -0000	1.2
--- .cvsignore	28 Jul 2007 12:59:38 -0000	1.3
***************
*** 2,3 ****
--- 2,4 ----
  *.d
  olsrd-current.tar.bz2
+ olsr_switch

Index: Makefile
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** Makefile	26 Jul 2007 17:34:53 -0000	1.88
--- Makefile	28 Jul 2007 12:59:38 -0000	1.89
***************
*** 80,84 ****
  		-rm -f $(OBJS) $(SRCS:%.c=%.d) olsrd olsrd.exe
  		$(MAKECMD) -C $(CFGDIR) clean
- 		$(MAKECMD) -C $(SWITCHDIR) clean
  
  uberclean:	clean clean_libs
--- 80,83 ----
***************
*** 86,89 ****
--- 85,89 ----
  		find . \( -name '*.[od]' -o -name '*~' \) -print | xargs -r rm -f
  		$(MAKECMD) -C $(CFGDIR) uberclean
+ 		$(MAKECMD) -C $(SWITCHDIR) clean
  
  install: install_olsrd
***************
*** 182,186 ****
  
  
! build_all:	cfgparser olsrd libs
  install_all:	install install_libs
  clean_all:	uberclean clean_libs
--- 182,186 ----
  
  
! build_all:	cfgparser olsrd libs switch
  install_all:	install install_libs
  clean_all:	uberclean clean_libs

Index: Makefile.inc
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile.inc,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Makefile.inc	26 Jul 2007 17:34:53 -0000	1.20
--- Makefile.inc	28 Jul 2007 12:59:38 -0000	1.21
***************
*** 2,8 ****
  CCACHE ?=       $(shell sh -c "type -path ccache")
  ifeq ($(origin CC),default)
! CC = 		$(CCACHE) gcc
  else
! CC ?= 		$(CCACHE) gcc
  endif
  STRIP ?=	strip
--- 2,8 ----
  CCACHE ?=       $(shell sh -c "type -path ccache")
  ifeq ($(origin CC),default)
! CC = 		$(CCACHE) gcc4
  else
! CC ?= 		$(CCACHE) gcc4
  endif
  STRIP ?=	strip
***************
*** 34,38 ****
  WARNINGS +=	-Wmissing-declarations
  WARNINGS +=	-Wsign-compare
! WARNINGS +=	-Waggregate-return
  WARNINGS +=	-Wmissing-noreturn
  WARNINGS +=	-Wmissing-format-attribute
--- 34,38 ----
  WARNINGS +=	-Wmissing-declarations
  WARNINGS +=	-Wsign-compare
! #WARNINGS +=	-Waggregate-return
  WARNINGS +=	-Wmissing-noreturn
  WARNINGS +=	-Wmissing-format-attribute
***************
*** 44,54 ****
  WARNINGS +=	-Winline
  WARNINGS +=	-Wdisabled-optimization
! #WARNINGS +=	-Werror
  WARNINGS :=	$(shell CC="$(CC)" $(TOPDIR)/gcc-warnings $(WARNINGS))
  endif
  CFLAGS +=	$(WARNINGS)
! CFLAGS +=	-O2
  CFLAGS +=	-g
  endif
  
  ifdef OLSRD_PLUGIN
--- 44,55 ----
  WARNINGS +=	-Winline
  WARNINGS +=	-Wdisabled-optimization
! WARNINGS +=	-Werror
  WARNINGS :=	$(shell CC="$(CC)" $(TOPDIR)/gcc-warnings $(WARNINGS))
  endif
  CFLAGS +=	$(WARNINGS)
! CFLAGS +=	-Os
  CFLAGS +=	-g
  endif
+ CFLAGS +=	-fmudflapth
  
  ifdef OLSRD_PLUGIN
***************
*** 61,64 ****
--- 62,66 ----
  LDFLAGS +=	-Wl,-export-dynamic 
  endif
+ LDFLAGS += 	-lmudflap
  
  ###################################