[Olsr-cvs] olsrd-current Makefile, 1.61, 1.62 Makefile.inc, 1.2, 1.3 README, 1.11, 1.12

[Bruno Randolf]

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

Modified Files:
	Makefile Makefile.inc README 
Log Message:
minor makefile restructurings


Index: README
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/README,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** README	26 May 2005 16:11:15 -0000	1.11
--- README	2 Jun 2005 14:41:58 -0000	1.12
***************
*** 216,219 ****
--- 216,220 ----
  ------------------------------------------------------------
  olsrd		+/+	+/+	+/+	+/+	+/+	?
+ olsr_switch	+/+	+/?	?	?	?	?
  ------------------------------------------------------------
  PLUGINS
***************
*** 221,225 ****
  dyn_gw		+/+	+/?	+/?	+/?	+/?	?
  httpinfo	+/+	+/+	+/+	+/?	+/?	?
! mini		+/+	?	+/+	?	?	?
  nameservice	+/+	+/?	+/?	+/?	+/?	?
  powerinfo	+/+	+/+	+/+	+/?	+/?	?
--- 222,226 ----
  dyn_gw		+/+	+/?	+/?	+/?	+/?	?
  httpinfo	+/+	+/+	+/+	+/?	+/?	?
! mini		+/+	+/?	+/+	?	?	?
  nameservice	+/+	+/?	+/?	+/?	+/?	?
  powerinfo	+/+	+/+	+/+	+/?	+/?	?

Index: Makefile
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** Makefile	30 May 2005 13:15:42 -0000	1.61
--- Makefile	2 Jun 2005 14:41:57 -0000	1.62
***************
*** 41,44 ****
--- 41,50 ----
  include Makefile.inc
  
+ LIBS +=		$(OS_LIB_DYNLOAD)
+ 
+ ifeq ($(OS), win32)
+ LDFLAGS +=	-Wl,--out-implib=libolsrd.a -Wl,--export-all-symbols
+ endif
+ 
  VERS =		0.4.10pre
  

Index: Makefile.inc
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.inc	26 May 2005 11:31:17 -0000	1.2
--- Makefile.inc	2 Jun 2005 14:41:58 -0000	1.3
***************
*** 27,32 ****
  ifdef OLSRD_PLUGIN
  # c and ld flags for libraries (plugins)
! CFLAGS +=	-DOLSR_PLUGIN -fPIC
! LDFLAGS +=	-shared  -fPIC -Wl,-soname,$(PLUGIN_NAME)
  LDFLAGS +=	-Wl,--version-script=version-script.txt 
  else
--- 27,32 ----
  ifdef OLSRD_PLUGIN
  # c and ld flags for libraries (plugins)
! CFLAGS +=	-DOLSR_PLUGIN
! LDFLAGS +=	-shared -Wl,-soname,$(PLUGIN_NAME)
  LDFLAGS +=	-Wl,--version-script=version-script.txt 
  else