[Olsr-cvs] olsrd-current Makefile.inc,1.21,1.22

[Bernd Petrovitsch]

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

Modified Files:
	Makefile.inc 
Log Message:
* ooops

Index: Makefile.inc
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile.inc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Makefile.inc	28 Jul 2007 12:59:38 -0000	1.21
--- Makefile.inc	28 Jul 2007 13:40:19 -0000	1.22
***************
*** 2,8 ****
  CCACHE ?=       $(shell sh -c "type -path ccache")
  ifeq ($(origin CC),default)
! CC = 		$(CCACHE) gcc4
  else
! CC ?= 		$(CCACHE) gcc4
  endif
  STRIP ?=	strip
--- 2,8 ----
  CCACHE ?=       $(shell sh -c "type -path ccache")
  ifeq ($(origin CC),default)
! CC = 		$(CCACHE) gcc
  else
! CC ?= 		$(CCACHE) gcc
  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,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
--- 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
***************
*** 62,66 ****
  LDFLAGS +=	-Wl,-export-dynamic 
  endif
- LDFLAGS += 	-lmudflap
  
  ###################################
--- 61,64 ----