[Olsr-cvs] olsrd-current/make Makefile.fbsd, 1.10, 1.11 Makefile.linux, 1.14, 1.15 Makefile.nbsd, 1.7, 1.8 Makefile.obsd, 1.6, 1.7 Makefile.osx, 1.9, 1.10 Makefile.win32, 1.10, 1.11 Makefile.wince, 1.5, 1.6

[Bernd Petrovitsch]

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

Modified Files:
	Makefile.fbsd Makefile.linux Makefile.nbsd Makefile.obsd 
	Makefile.osx Makefile.win32 Makefile.wince 
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.obsd
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.obsd,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.obsd	26 Jul 2007 17:34:54 -0000	1.6
--- Makefile.obsd	29 Aug 2007 21:46:25 -0000	1.7
***************
*** 22,25 ****
--- 22,26 ----
  
  OS_LIB_PTHREAD =
+ OS_CFLAG_PTHREAD =
  OS_LIB_DYNLOAD =
  

Index: Makefile.wince
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.wince,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.wince	26 Jul 2007 17:34:54 -0000	1.5
--- Makefile.wince	29 Aug 2007 21:46:26 -0000	1.6
***************
*** 20,23 ****
--- 20,24 ----
  
  OS_LIB_PTHREAD =
+ OS_CFLAG_PTHREAD =
  OS_LIB_DYNLOAD =
  

Index: Makefile.win32
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.win32,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile.win32	26 Jul 2007 17:34:54 -0000	1.10
--- Makefile.win32	29 Aug 2007 21:46:26 -0000	1.11
***************
*** 24,27 ****
--- 24,28 ----
  
  OS_LIB_PTHREAD =
+ OS_CFLAG_PTHREAD =
  OS_LIB_DYNLOAD =
  

Index: Makefile.linux
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.linux,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile.linux	2 Aug 2007 16:26:55 -0000	1.14
--- Makefile.linux	29 Aug 2007 21:46:25 -0000	1.15
***************
*** 30,33 ****
--- 30,34 ----
  
  OS_LIB_PTHREAD = -lpthread
+ OS_CFLAG_PTHREAD = -pthread
  OS_LIB_DYNLOAD = -ldl
  

Index: Makefile.osx
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.osx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.osx	26 Jul 2007 17:34:54 -0000	1.9
--- Makefile.osx	29 Aug 2007 21:46:26 -0000	1.10
***************
*** 26,29 ****
--- 26,30 ----
  
  OS_LIB_PTHREAD =
+ OS_CFLAG_PTHREAD =
  OS_LIB_DYNLOAD =
  

Index: Makefile.fbsd
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.fbsd,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile.fbsd	26 Jul 2007 17:34:54 -0000	1.10
--- Makefile.fbsd	29 Aug 2007 21:46:25 -0000	1.11
***************
*** 38,41 ****
--- 38,42 ----
  
  OS_LIB_PTHREAD = -pthread
+ OS_CFLAG_PTHREAD = -pthread
  OS_LIB_DYNLOAD =
  

Index: Makefile.nbsd
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.nbsd,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.nbsd	26 Jul 2007 17:34:54 -0000	1.7
--- Makefile.nbsd	29 Aug 2007 21:46:25 -0000	1.8
***************
*** 22,25 ****
--- 22,26 ----
  
  OS_LIB_PTHREAD = 
+ OS_CFLAG_PTHREAD =
  OS_LIB_DYNLOAD =