[Olsr-cvs] olsrd-current/make Makefile.fbsd, 1.2, 1.3 Makefile.linux, 1.2, 1.3 Makefile.nbsd, 1.2, 1.3 Makefile.obsd, 1.2, 1.3 Makefile.osx, 1.2, 1.3 Makefile.win32, 1.2, 1.3 Makefile.wince, 1.1, 1.2
Bruno Randolf
(spam-protected)
Thu Jun 2 16:42:01 CEST 2005
Update of /cvsroot/olsrd/olsrd-current/make
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3509/make
Modified Files:
Makefile.fbsd Makefile.linux Makefile.nbsd Makefile.obsd
Makefile.osx Makefile.win32 Makefile.wince
Log Message:
minor makefile restructurings
Index: Makefile.obsd
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.obsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.obsd 25 May 2005 14:16:24 -0000 1.2
--- Makefile.obsd 2 Jun 2005 14:41:59 -0000 1.3
***************
*** 14,16 ****
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
--- 14,24 ----
PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
! /sbin/ldconfig
!
! ifdef OLSRD_PLUGIN
! CFLAGS += -fPIC
! LDFLAGS += -fPIC
! endif
!
! OS_LIB_PTHREAD =
! OS_LIB_DYNLOAD =
Index: Makefile.wince
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.wince,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.wince 25 May 2005 13:50:22 -0000 1.1
--- Makefile.wince 2 Jun 2005 14:41:59 -0000 1.2
***************
*** 13,14 ****
--- 13,22 ----
INCLUDES += -Isrc/win32 -Isrc/win32/ce
+
+ ifdef OLSRD_PLUGIN
+ CFLAGS +=
+ LDFLAGS += -lolsrd
+ endif
+
+ OS_LIB_PTHREAD =
+ OS_LIB_DYNLOAD =
Index: Makefile.win32
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.win32,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.win32 25 May 2005 22:16:57 -0000 1.2
--- Makefile.win32 2 Jun 2005 14:41:59 -0000 1.3
***************
*** 9,19 ****
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
!
INCLUDES += -I$(TOPDIR)/src/win32
CFLAGS += -mno-cygwin
--- 9,14 ----
HDRS += $(wildcard src/win32/*.h)
DEFINES += -DWIN32
! LIBS += -mno-cygwin -lws2_32 -liphlpapi
INCLUDES += -I$(TOPDIR)/src/win32
CFLAGS += -mno-cygwin
***************
*** 22,26 ****
INSTALL_LIB = cp $(PLUGIN_FULLNAME) ../..
! OS_PTHREAD =
olsr-$(VERS).zip: gui/win32/Main/Release/Switch.exe \
--- 17,28 ----
INSTALL_LIB = cp $(PLUGIN_FULLNAME) ../..
! 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 \
Index: Makefile.fbsd
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.fbsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.fbsd 25 May 2005 14:16:24 -0000 1.2
--- Makefile.fbsd 2 Jun 2005 14:41:58 -0000 1.3
***************
*** 24,30 ****
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
--- 24,36 ----
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_LIB_PTHREAD = -pthread
! OS_LIB_DYNLOAD = -ldl
Index: Makefile.linux
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.linux,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.linux 25 May 2005 14:16:24 -0000 1.2
--- Makefile.linux 2 Jun 2005 14:41:59 -0000 1.3
***************
*** 10,18 ****
DEFINES = -Dlinux
! LIBS = -ldl
PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
INSTALL_LIB = install -D -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
/sbin/ldconfig -n $(LIBDIR)
! OS_PTHREAD = -lpthread
\ No newline at end of file
--- 10,24 ----
DEFINES = -Dlinux
! 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_LIB_PTHREAD = -lpthread
! OS_LIB_DYNLOAD = -ldl
Index: Makefile.osx
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.osx,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.osx 25 May 2005 14:16:24 -0000 1.2
--- Makefile.osx 2 Jun 2005 14:41:59 -0000 1.3
***************
*** 10,16 ****
DEFINES = -D__MacOSX__
! LIBS = -ldl
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
--- 10,24 ----
DEFINES = -D__MacOSX__
! LIBS =
PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
! /sbin/ldconfig
!
! ifdef OLSRD_PLUGIN
! CFLAGS += -fPIC
! LDFLAGS += -fPIC
! endif
!
! OS_LIB_PTHREAD =
! OS_LIB_DYNLOAD =
Index: Makefile.nbsd
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.nbsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.nbsd 25 May 2005 14:16:24 -0000 1.2
--- Makefile.nbsd 2 Jun 2005 14:41:59 -0000 1.3
***************
*** 14,16 ****
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
--- 14,24 ----
PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
! /sbin/ldconfig
!
! ifdef OLSRD_PLUGIN
! CFLAGS += -fPIC
! LDFLAGS += -fPIC
! endif
!
! OS_LIB_PTHREAD =
! OS_LIB_DYNLOAD =
More information about the Olsr-cvs
mailing list