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

Bernd Petrovitsch (spam-protected)
Thu Jul 26 19:34:56 CEST 2007


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

Modified Files:
	Makefile.fbsd Makefile.linux Makefile.nbsd Makefile.obsd 
	Makefile.osx Makefile.win32 Makefile.wince 
Log Message:
* the contents of INCLUDES and DEFINES should now be placed into CPPFLAGS
  as it belongs in there
* also all -I and -D options from CFALGS are now there
* however, we add for the time being INCLUDES and DEFINES to CPPFLAGS
  (and warn) to not break ouf of tree modules.
* and the -DSUPPORT_OLD_PLUGIN_VERSIONS=1 is now fixed as it should have
  been right from the start


Index: Makefile.obsd
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.obsd,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.obsd	12 Nov 2006 21:54:53 -0000	1.5
--- Makefile.obsd	26 Jul 2007 17:34:54 -0000	1.6
***************
*** 6,14 ****
  LIBDIR =	$(DESTDIR)/usr/lib
  
! SRCS +=		$(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
! HDRS +=		$(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
  
! DEFINES =	-D__OpenBSD__
! LIBS =		
  
  PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
--- 6,14 ----
  LIBDIR =	$(DESTDIR)/usr/lib
  
! SRCS +=		$(wildcard src/bsd/*.c src/unix/*.c)
! HDRS +=		$(wildcard src/bsd/*.h src/unix/*.h)
  
! CPPFLAGS +=	-D__OpenBSD__
! LIBS +=		
  
  PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)

Index: Makefile.wince
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.wince,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.wince	12 Nov 2006 21:54:53 -0000	1.4
--- Makefile.wince	26 Jul 2007 17:34:54 -0000	1.5
***************
*** 9,16 ****
  HDRS +=		$(wildcard src/win32/*.h)
  
! DEFINES =	-DWIN32 -DWINCE
! LIBS =		-lwinsock -liphlpapi
  
! INCLUDES += 	-Isrc/win32 -Isrc/win32/ce
  
  ifdef OLSRD_PLUGIN
--- 9,16 ----
  HDRS +=		$(wildcard src/win32/*.h)
  
! CPPFLAGS +=	-DWIN32 -DWINCE
! LIBS +=		-lwinsock -liphlpapi
  
! CPPFLAGS += 	-Isrc/win32 -Isrc/win32/ce
  
  ifdef OLSRD_PLUGIN

Index: Makefile.win32
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.win32,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.win32	27 Mar 2007 03:58:47 -0000	1.9
--- Makefile.win32	26 Jul 2007 17:34:54 -0000	1.10
***************
*** 9,15 ****
  HDRS +=		$(wildcard src/win32/*.h)
  
! DEFINES +=	-DWIN32 -D_WIN32_WINNT=0x0600
  LIBS +=		-mno-cygwin -lws2_32 -liphlpapi
! INCLUDES += 	-I$(TOPDIR)/src/win32
  CFLAGS +=	-mno-cygwin
  
--- 9,15 ----
  HDRS +=		$(wildcard src/win32/*.h)
  
! CPPFLAGS +=	-DWIN32 -D_WIN32_WINNT=0x0600
  LIBS +=		-mno-cygwin -lws2_32 -liphlpapi
! CPPFLAGS += 	-I$(TOPDIR)/src/win32
  CFLAGS +=	-mno-cygwin
  

Index: Makefile.linux
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.linux,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile.linux	27 Apr 2007 11:41:25 -0000	1.11
--- Makefile.linux	26 Jul 2007 17:34:54 -0000	1.12
***************
*** 7,15 ****
  LIBDIR =	$(DESTDIR)$(shell if [ "$(ARCH)" = "x86_64" -a -d "/usr/lib64" ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
  
! SRCS += 	$(wildcard src/linux/*.c) $(wildcard src/unix/*.c)
! HDRS +=		$(wildcard src/linux/*.h) $(wildcard src/unix/*.h)
  
! DEFINES = 	-Dlinux
! LIBS =		
  
  PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
--- 7,15 ----
  LIBDIR =	$(DESTDIR)$(shell if [ "$(ARCH)" = "x86_64" -a -d "/usr/lib64" ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
  
! SRCS += 	$(wildcard src/linux/*.c src/unix/*.c)
! HDRS +=		$(wildcard src/linux/*.h src/unix/*.h)
  
! CPPFLAGS += 	-Dlinux
! LIBS +=		
  
  PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)

Index: Makefile.osx
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.osx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.osx	30 Jan 2007 16:51:04 -0000	1.8
--- Makefile.osx	26 Jul 2007 17:34:54 -0000	1.9
***************
*** 10,18 ****
  LIBDIR =	$(DESTDIR)/usr/lib
  
! SRCS +=		$(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
! HDRS +=		$(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
  
! DEFINES =	-D__MacOSX__
! LIBS =		
  
  PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
--- 10,18 ----
  LIBDIR =	$(DESTDIR)/usr/lib
  
! SRCS +=		$(wildcard src/bsd/*.c src/unix/*.c)
! HDRS +=		$(wildcard src/bsd/*.h src/unix/*.h)
  
! CPPFLAGS +=	-D__MacOSX__
! LIBS +=		
  
  PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)

Index: Makefile.fbsd
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.fbsd,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.fbsd	12 Nov 2006 21:54:53 -0000	1.9
--- Makefile.fbsd	26 Jul 2007 17:34:54 -0000	1.10
***************
*** 15,27 ****
  LIBS =
  
! CFLAGS +=	-DOLSRD_GLOBAL_CONF_FILE=\"$(CFGFILE)\"
  
  ifdef NO_80211
! CFLAGS += -DFBSD_NO_80211=1
  endif
  
  ifdef LIBNET
  
! CFLAGS +=	-DSPOOF -I$(DESTDIR)/include
  LIBS +=		-L$(DESTDIR)/lib -lnet
  
--- 15,27 ----
  LIBS =
  
! CPPFLAGS +=	-DOLSRD_GLOBAL_CONF_FILE=\"$(CFGFILE)\"
  
  ifdef NO_80211
! CPPFLAGS +=	-DFBSD_NO_80211=1
  endif
  
  ifdef LIBNET
  
! CPPFLAGS +=	-DSPOOF -I$(DESTDIR)/include
  LIBS +=		-L$(DESTDIR)/lib -lnet
  

Index: Makefile.nbsd
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.nbsd,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.nbsd	12 Nov 2006 21:54:53 -0000	1.6
--- Makefile.nbsd	26 Jul 2007 17:34:54 -0000	1.7
***************
*** 6,14 ****
  LIBDIR =	$(DESTDIR)/usr/lib
  
! SRCS +=		$(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
! HDRS +=		$(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
  
! DEFINES =	-D__NetBSD__
! LIBS =		
  
  PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
--- 6,14 ----
  LIBDIR =	$(DESTDIR)/usr/lib
  
! SRCS +=		$(wildcard src/bsd/*.c src/unix/*.c)
! HDRS +=		$(wildcard src/bsd/*.h src/unix/*.h)
  
! CPPFLAGS +=	-D__NetBSD__
! LIBS +=		
  
  PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)





More information about the Olsr-cvs mailing list