[Olsr-cvs] olsrd-current CHANGELOG, 1.77, 1.78 Makefile, 1.93, 1.94 Makefile.inc, 1.27, 1.28

[Bernd Petrovitsch]

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

Modified Files:
	CHANGELOG Makefile Makefile.inc 
Log Message:
- Based on a patch by Gianni Costanzi <(spam-protected)> (so credits
  and thanks have to go there):
  added OS_CFLAG_PTHREAD Makefile variable since gcc (on Linux) requests this
  in the manual page.
  Changes/additions:
  - I added definitions to all OS-specific Makefile.$OS with the value similar
    to the value in OS_LIB_PTHREAD (either empty or "-pthread").
  - The variable is added to CPPFLAGS (and not CFLAGS) since CPPFLAGS is used
    for all cpp and gcc calls (and gcc's man page indicates that it sets
    variables for both of them).

This has not been compiled or tested on anything except Linux up to now (and
to the best of my knowledge). So if you are a *BSD, Windows/CygWin or MacOSX
guru and there is something wrong, please send a patch.



Index: Makefile
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** Makefile	23 Aug 2007 09:12:55 -0000	1.93
--- Makefile	29 Aug 2007 21:46:25 -0000	1.94
***************
*** 45,51 ****
  CPPFLAGS +=	-DVERSION=\"$(VERS)\"
  
  MAKECMD = $(MAKE) OS="$(OS)" WARNINGS="$(WARNINGS)"
  
! LIBS +=		$(OS_LIB_DYNLOAD)
  
  ifeq ($(OS), win32)
--- 45,52 ----
  CPPFLAGS +=	-DVERSION=\"$(VERS)\"
  
+ # pass generated variables to save time
  MAKECMD = $(MAKE) OS="$(OS)" WARNINGS="$(WARNINGS)"
  
! LIBS +=		$(OS_LIB_DYNLOAD) $(OS_LIB_PTHREAD)
  
  ifeq ($(OS), win32)
***************
*** 56,65 ****
  CFGDIR =	src/cfgparser
  CFGOBJS = 	$(CFGDIR)/oscan.o $(CFGDIR)/oparse.o $(CFGDIR)/olsrd_conf.o
! CFGDEPS = 	$(wildcard $(CFGDIR)/*.c) $(wildcard $(CFGDIR)/*.h) $(CFGDIR)/oparse.y $(CFGDIR)/oscan.lex
! TAG_SRCS = $(SRCS) $(HDRS) $(wildcard src/cfgparser/*.c) $(wildcard src/cfgparser/*.h) $(wildcard src/olsr_switch/*.c) $(wildcard src/olsr_switch/*.h)
  
  default_target: cfgparser $(EXENAME)
  
! $(EXENAME):		$(OBJS) $(CFGOBJS)
  		$(CC) $(LDFLAGS) -o $@ $(OBJS) $(CFGOBJS) $(LIBS)
  
--- 57,66 ----
  CFGDIR =	src/cfgparser
  CFGOBJS = 	$(CFGDIR)/oscan.o $(CFGDIR)/oparse.o $(CFGDIR)/olsrd_conf.o
! CFGDEPS = 	$(wildcard $(CFGDIR)/*.[ch]) $(CFGDIR)/oparse.y $(CFGDIR)/oscan.lex
! TAG_SRCS =	$(SRCS) $(HDRS) $(wildcard src/cfgparser/*.[ch] src/olsr_switch/*.[ch])
  
  default_target: cfgparser $(EXENAME)
  
! $(EXENAME):	$(OBJS) $(CFGOBJS)
  		$(CC) $(LDFLAGS) -o $@ $(OBJS) $(CFGOBJS) $(LIBS)
  

Index: Makefile.inc
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile.inc,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Makefile.inc	23 Aug 2007 09:09:23 -0000	1.27
--- Makefile.inc	29 Aug 2007 21:46:25 -0000	1.28
***************
*** 22,26 ****
  CFGFILE ?= $(ETCDIR)/$(CFGNAME)
  
! CPPFLAGS =	-Isrc -I$(TOPDIR)/src 
  
  # add gcc warnings and optimizations if CFLAGS not set
--- 22,26 ----
  CFGFILE ?= $(ETCDIR)/$(CFGNAME)
  
! CPPFLAGS =	-Isrc -I$(TOPDIR)/src
  
  # add gcc warnings and optimizations if CFLAGS not set
***************
*** 50,54 ****
  CFLAGS +=	$(WARNINGS)
  CFLAGS +=	-O2
! CFLAGS +=	-g
  endif
  
--- 50,58 ----
  CFLAGS +=	$(WARNINGS)
  CFLAGS +=	-O2
! #CFLAGS +=	-g
! CFLAGS +=	$(EXTRA_CFLAGS)
! 
! # Must be specified along with -lpthread on linux
! CPPFLAGS +=	$(OS_CFLAG_PTHREAD)
  endif
  

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/CHANGELOG,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** CHANGELOG	28 Aug 2007 20:45:17 -0000	1.77
--- CHANGELOG	29 Aug 2007 21:46:25 -0000	1.78
***************
*** 36,40 ****
    in Makefile.
  
! PATCH by Bernd Petrovitsch <(spam-protected)>
  - Made a function from the ME_TO_DOUBLE() macro (in src/mantissa.h).
    This saves code throughout the code even on i386 and will even more
--- 36,40 ----
    in Makefile.
  
! PATCHES and CLEANUPS by Bernd Petrovitsch <(spam-protected)>
  - Made a function from the ME_TO_DOUBLE() macro (in src/mantissa.h).
    This saves code throughout the code even on i386 and will even more
***************
*** 43,48 ****
    floating point operations to save CPU power - especially on embedded
    devices.
- 
- CLEANUPS
  - paving the way to activate -Wshadow, much more to do
  - const-ify parameters here and there
--- 43,46 ----
***************
*** 50,53 ****
--- 48,62 ----
  - Killed "extern" declarations in (not generated) .c files
  
+ - Based on a patch by Gianni Costanzi <(spam-protected)> (so credits
+   and thanks have to go there):
+   added OS_CFLAG_PTHREAD Makefile variable since gcc (on Linux) requests this
+   in the manual page.
+   Changes/additions:
+   - I added definitions to all OS-specific Makefile.$OS with the value similar
+     to the value in OS_LIB_PTHREAD (either empty or "-pthread").
+   - The variable is added to CPPFLAGS (and not CFLAGS) since CPPFLAGS is used
+     for all cpp and gcc calls (and gcc's man page indicates that it sets
+     variables for both of them).
+ 
  0.5.3 ---------------------------------------------------------------------