minor makefile restructurings

diff --git a/Makefile b/Makefile
index 63ce6a1..b83d4cb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,11 +35,17 @@
 # to the project. For more information see the website or contact
 # the copyright holders.
 #
-# $Id: Makefile,v 1.61 2005/05/30 13:15:42 kattemat Exp $
+# $Id: Makefile,v 1.62 2005/06/02 14:41:57 br1 Exp $
 
 TOPDIR = .
 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
 
 SWITCHDIR =     src/olsr_switch

diff --git a/Makefile.inc b/Makefile.inc
index 353531c..1e05957 100644 (file)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -26,8 +26,8 @@ endif
 
 ifdef OLSRD_PLUGIN
 # c and ld flags for libraries (plugins)
-CFLAGS +=      -DOLSR_PLUGIN -fPIC
-LDFLAGS +=     -shared  -fPIC -Wl,-soname,$(PLUGIN_NAME)
+CFLAGS +=      -DOLSR_PLUGIN
+LDFLAGS +=     -shared -Wl,-soname,$(PLUGIN_NAME)
 LDFLAGS +=     -Wl,--version-script=version-script.txt 
 else
 # c and ld flags for main

diff --git a/README b/README
index 4ebdeda..e5f1de7 100644 (file)
--- a/README
+++ b/README
@@ -215,12 +215,13 @@ To use the plugins add them to the olsrd configuration file.
 COMPONENT/OS   Linux   Win32   FreeBSD NetBSD  OpenBSD OSX
 ------------------------------------------------------------
 olsrd          +/+     +/+     +/+     +/+     +/+     ?
+olsr_switch    +/+     +/?     ?       ?       ?       ?
 ------------------------------------------------------------
 PLUGINS
 dot_draw       +/+     +/?     +/+     +/+     +/+     ?
 dyn_gw         +/+     +/?     +/?     +/?     +/?     ?
 httpinfo       +/+     +/+     +/+     +/?     +/?     ?
-mini           +/+     ?       +/+     ?       ?       ?
+mini           +/+     +/?     +/+     ?       ?       ?
 nameservice    +/+     +/?     +/?     +/?     +/?     ?
 powerinfo      +/+     +/+     +/+     +/?     +/?     ?
 secure         +/+     +/+     +/+     +/?     +/?     ?
@@ -454,4 +455,4 @@ to use "osx" instead of "fbsd", as in
   gmake OS=osx
 
 
-$Id: README,v 1.11 2005/05/26 16:11:15 br1 Exp $
+$Id: README,v 1.12 2005/06/02 14:41:58 br1 Exp $

diff --git a/lib/dyn_gw/Makefile b/lib/dyn_gw/Makefile
index 49f4ec7..fc15964 100644 (file)
--- a/lib/dyn_gw/Makefile
+++ b/lib/dyn_gw/Makefile
@@ -35,7 +35,7 @@
 # to the project. For more information see the website or contact
 # the copyright holders.
 #
-# $Id: Makefile,v 1.18 2005/05/25 13:50:22 br1 Exp $
+# $Id: Makefile,v 1.19 2005/06/02 14:41:58 br1 Exp $
 
 OLSRD_PLUGIN = true
 PLUGIN_NAME =  olsrd_dyn_gw
@@ -44,7 +44,7 @@ PLUGIN_VER =  0.4
 TOPDIR = ../..
 include $(TOPDIR)/Makefile.inc
 
-LIBS +=                $(OS_PTHREAD)
+LIBS +=                $(OS_LIB_PTHREAD)
 
 default_target: $(PLUGIN_FULLNAME)
 

diff --git a/make/Makefile.fbsd b/make/Makefile.fbsd
index ef74340..0dd8139 100644 (file)
--- a/make/Makefile.fbsd
+++ b/make/Makefile.fbsd
@@ -23,8 +23,14 @@ LIBS =+              -L$(INSTALL_PREFIX)/lib -lnet
 
 endif
 
+ifdef OLSRD_PLUGIN
+CFLAGS +=      -fPIC
+LDFLAGS +=     -fPIC
+endif
+
 PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
 INSTALL_LIB =  install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
                /sbin/ldconfig
 
-OS_PTHREAD = -pthread
\ No newline at end of file
+OS_LIB_PTHREAD = -pthread
+OS_LIB_DYNLOAD = -ldl

diff --git a/make/Makefile.linux b/make/Makefile.linux
index 25256a1..eb57740 100644 (file)
--- a/make/Makefile.linux
+++ b/make/Makefile.linux
@@ -9,10 +9,16 @@ SRCS +=       $(wildcard src/linux/*.c) $(wildcard src/unix/*.c)
 HDRS +=                $(wildcard src/linux/*.h) $(wildcard src/unix/*.h)
 
 DEFINES =      -Dlinux
-LIBS =         -ldl
+LIBS =         
 
 PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
 INSTALL_LIB =  install -D -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
                /sbin/ldconfig -n $(LIBDIR)
+
+ifdef OLSRD_PLUGIN
+CFLAGS +=      -fPIC
+LDFLAGS +=     -fPIC
+endif
                
-OS_PTHREAD = -lpthread
\ No newline at end of file
+OS_LIB_PTHREAD = -lpthread
+OS_LIB_DYNLOAD = -ldl

diff --git a/make/Makefile.nbsd b/make/Makefile.nbsd
index cc1c277..0ad2603 100644 (file)
--- a/make/Makefile.nbsd
+++ b/make/Makefile.nbsd
@@ -13,4 +13,12 @@ LIBS =
 
 PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
 INSTALL_LIB =  install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
-               /sbin/ldconfig
\ No newline at end of file
+               /sbin/ldconfig
+
+ifdef OLSRD_PLUGIN
+CFLAGS +=      -fPIC
+LDFLAGS +=     -fPIC
+endif
+
+OS_LIB_PTHREAD =
+OS_LIB_DYNLOAD =

diff --git a/make/Makefile.obsd b/make/Makefile.obsd
index 24f4388..723cf0c 100644 (file)
--- a/make/Makefile.obsd
+++ b/make/Makefile.obsd
@@ -13,4 +13,12 @@ LIBS =
 
 PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
 INSTALL_LIB =  install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
-               /sbin/ldconfig
\ No newline at end of file
+               /sbin/ldconfig
+
+ifdef OLSRD_PLUGIN
+CFLAGS +=      -fPIC
+LDFLAGS +=     -fPIC
+endif
+
+OS_LIB_PTHREAD =
+OS_LIB_DYNLOAD =

diff --git a/make/Makefile.osx b/make/Makefile.osx
index 547e837..fa94083 100644 (file)
--- a/make/Makefile.osx
+++ b/make/Makefile.osx
@@ -9,8 +9,16 @@ SRCS +=                $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
 HDRS +=                $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
 
 DEFINES =      -D__MacOSX__
-LIBS =         -ldl
+LIBS =         
 
 PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
 INSTALL_LIB =  install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
-               /sbin/ldconfig
\ No newline at end of file
+               /sbin/ldconfig
+
+ifdef OLSRD_PLUGIN
+CFLAGS +=      -fPIC
+LDFLAGS +=     -fPIC
+endif
+               
+OS_LIB_PTHREAD =
+OS_LIB_DYNLOAD =

diff --git a/make/Makefile.win32 b/make/Makefile.win32
index c00dddf..9f2f3a2 100644 (file)
--- a/make/Makefile.win32
+++ b/make/Makefile.win32
@@ -8,20 +8,22 @@ EXENAME = olsrd.exe
 SRCS +=                $(wildcard src/win32/*.c)
 HDRS +=                $(wildcard src/win32/*.h)
 
-ifdef OLSRD_PLUGIN
-       LIBS += $(TOPDIR)/src/win32/compat.o
-endif
-
 DEFINES +=     -DWIN32
-LIBS +=                -mno-cygwin -Wl,--out-implib=libolsrd.a -Wl,--export-all-symbols -lws2_32 -liphlpapi
-
+LIBS +=                -mno-cygwin -lws2_32 -liphlpapi
 INCLUDES +=    -I$(TOPDIR)/src/win32
 CFLAGS +=      -mno-cygwin
 
 PLUGIN_FULLNAME ?= $(PLUGIN_NAME).dll
 INSTALL_LIB =  cp $(PLUGIN_FULLNAME) ../..
 
-OS_PTHREAD = 
+ifdef OLSRD_PLUGIN
+LDFLAGS +=     -L$(TOPDIR)
+#LIBS +=       $(TOPDIR)/src/win32/compat.o
+LIBS +=                -lolsrd
+endif
+
+OS_LIB_PTHREAD =
+OS_LIB_DYNLOAD =
 
 olsr-$(VERS).zip:      gui/win32/Main/Release/Switch.exe \
                gui/win32/Shim/Release/Shim.exe \

diff --git a/make/Makefile.wince b/make/Makefile.wince
index 351412a..da2a2be 100644 (file)
--- a/make/Makefile.wince
+++ b/make/Makefile.wince
@@ -12,3 +12,11 @@ DEFINES =    -DWIN32 -DWINCE
 LIBS =         -lwinsock -liphlpapi
 
 INCLUDES +=    -Isrc/win32 -Isrc/win32/ce
+
+ifdef OLSRD_PLUGIN
+CFLAGS +=      
+LDFLAGS +=     -lolsrd
+endif
+
+OS_LIB_PTHREAD =
+OS_LIB_DYNLOAD =

diff --git a/src/cfgparser/Makefile b/src/cfgparser/Makefile
index eda85bf..8cae522 100644 (file)
--- a/src/cfgparser/Makefile
+++ b/src/cfgparser/Makefile
@@ -36,7 +36,7 @@
 # to the project. For more information see the website or contact
 # the copyright holders.
 #
-# $Id: Makefile,v 1.19 2005/05/25 13:50:22 br1 Exp $
+# $Id: Makefile,v 1.20 2005/06/02 14:41:59 br1 Exp $
 
 TOPDIR=../..
 include $(TOPDIR)/Makefile.inc
@@ -55,8 +55,6 @@ else
 
 LIBNAME ?=     olsrd_cfgparser.so.0.1
 BINNAME ?=     olsrd_cfgparser
-CFLAGS +=      -fPIC
-LDFLAGS +=     -Wl,--version-script=version-script.txt
 
 endif
 

diff --git a/src/olsr_switch/Makefile b/src/olsr_switch/Makefile
index 3fa7df6..cf72e83 100644 (file)
--- a/src/olsr_switch/Makefile
+++ b/src/olsr_switch/Makefile
@@ -3,6 +3,7 @@ include $(TOPDIR)/Makefile.inc
 
 ifeq ($(OS), win32)
 BINNAME = olsr_switch.exe
+OBJS += ../win32/compat.o
 else
 BINNAME = olsr_switch
 endif