[Olsr-cvs] olsrd-current/make Makefile.osx, 1.3, 1.4 guess_os.sh, 1.1, 1.2

Thomas Lopatic (spam-protected)
Thu Dec 29 20:48:45 CET 2005


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

Modified Files:
	Makefile.osx guess_os.sh 
Log Message:
Reanimated OS X port. Any OS X dynamic linking experts? Just tried a
couple of options from the ld man page that seemed plausible. Looks
okay, but should be verified by somebody that knows what he's doing.


Index: guess_os.sh
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/guess_os.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** guess_os.sh	25 May 2005 13:50:22 -0000	1.1
--- guess_os.sh	29 Dec 2005 19:48:43 -0000	1.2
***************
*** 18,22 ****
  		netbsd*)	arch=nbsd ;;
  		openbsd*)	arch=obsd ;;
! 		osx*)		arch=osx ;;
  		cygwin_*)	arch=win32 ;;
  		Windows_*)	arch=win32 ;;
--- 18,22 ----
  		netbsd*)	arch=nbsd ;;
  		openbsd*)	arch=obsd ;;
! 		darwin*)		arch=osx ;;
  		cygwin_*)	arch=win32 ;;
  		Windows_*)	arch=win32 ;;

Index: Makefile.osx
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.osx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.osx	2 Jun 2005 14:41:59 -0000	1.3
--- Makefile.osx	29 Dec 2005 19:48:43 -0000	1.4
***************
*** 18,22 ****
  ifdef OLSRD_PLUGIN
  CFLAGS +=	-fPIC
! LDFLAGS +=	-fPIC
  endif
  		
--- 18,24 ----
  ifdef OLSRD_PLUGIN
  CFLAGS +=	-fPIC
! LDFLAGS =	-fPIC -dynamiclib -single_module -flat_namespace -undefined suppress
! else
! LDFLAGS = -dynamic
  endif
  		





More information about the Olsr-cvs mailing list