[Olsr-cvs] olsrd-current Makefile,1.79,1.80

[Bernd Petrovitsch]

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

Modified Files:
	Makefile 
Log Message:
* pass OS always to sub-makes

Index: Makefile
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** Makefile	2 Apr 2007 10:07:44 -0000	1.79
--- Makefile	3 Apr 2007 09:53:41 -0000	1.80
***************
*** 45,48 ****
--- 45,50 ----
  include Makefile.inc
  
+ MAKECMD = $(MAKE) OS=$(OS)
+ 
  LIBS +=		$(OS_LIB_DYNLOAD)
  
***************
*** 63,73 ****
  
  cfgparser:	$(CFGDEPS)
! 		$(MAKE) -C $(CFGDIR)
  
  switch:		
! 		$(MAKE) -C $(SWITCHDIR)
  
  $(CFGOBJS):
! 		$(MAKE) -C $(CFGDIR)
  
  .PHONY: help libs clean_libs libs_clean clean uberclean install_libs libs_install install_bin install_olsrd install build_all install_all clean_all
--- 65,75 ----
  
  cfgparser:	$(CFGDEPS)
! 		$(MAKECMD) -C $(CFGDIR)
  
  switch:		
! 		$(MAKECMD) -C $(SWITCHDIR)
  
  $(CFGOBJS):
! 		$(MAKECMD) -C $(CFGDIR)
  
  .PHONY: help libs clean_libs libs_clean clean uberclean install_libs libs_install install_bin install_olsrd install build_all install_all clean_all
***************
*** 75,80 ****
  clean:
  		-rm -f $(OBJS) $(SRCS:%.c=%.d) olsrd olsrd.exe
! 		$(MAKE) -C $(CFGDIR) clean
! 		$(MAKE) -C $(SWITCHDIR) clean
  
  uberclean:	clean clean_libs
--- 77,82 ----
  clean:
  		-rm -f $(OBJS) $(SRCS:%.c=%.d) olsrd olsrd.exe
! 		$(MAKECMD) -C $(CFGDIR) clean
! 		$(MAKECMD) -C $(SWITCHDIR) clean
  
  uberclean:	clean clean_libs
***************
*** 82,87 ****
  		-rm -f src/*.[od~] 
  		-rm -f src/linux/*.[od~] src/unix/*.[od~] src/win32/*.[od~] src/bsd/*.[od~]
! 		$(MAKE) -C $(CFGDIR) uberclean
! 		$(MAKE) -C $(SWITCHDIR) clean
  
  install: install_olsrd
--- 84,89 ----
  		-rm -f src/*.[od~] 
  		-rm -f src/linux/*.[od~] src/unix/*.[od~] src/win32/*.[od~] src/bsd/*.[od~]
! 		$(MAKECMD) -C $(CFGDIR) uberclean
! 		$(MAKECMD) -C $(SWITCHDIR) clean
  
  install: install_olsrd
***************
*** 124,181 ****
  
  libs: 
! 		$(MAKE) -C lib LIBDIR=$(LIBDIR)
  
  libs_clean clean_libs:
! 		$(MAKE) -C lib LIBDIR=$(LIBDIR) clean
  
  libs_install install_libs:
! 		$(MAKE) -C lib LIBDIR=$(LIBDIR) install
  
  httpinfo:
! 		$(MAKE) -C lib/httpinfo clean
! 		$(MAKE) -C lib/httpinfo 
! 		$(MAKE) -C lib/httpinfo DESTDIR=$(DESTDIR) install 
  
  tas:
! 		$(MAKE) -C lib/tas clean
! 		$(MAKE) -C lib/tas DESTDIR=$(DESTDIR) install
  
  dot_draw:
! 		$(MAKE) -C lib/dot_draw clean
! 		$(MAKE) -C lib/dot_draw DESTDIR=$(DESTDIR) install
  
  nameservice:
! 		$(MAKE) -C lib/nameservice clean
! 		$(MAKE) -C lib/nameservice DESTDIR=$(DESTDIR) install
  
  dyn_gw:
! 		$(MAKE) -C lib/dyn_gw clean
! 		$(MAKE) -C lib/dyn_gw
! 		$(MAKE) -C lib/dyn_gw DESTDIR=$(DESTDIR) install
  
  dyn_gw_plain:
! 		$(MAKE) -C lib/dyn_gw_plain clean
! 		$(MAKE) -C lib/dyn_gw_plain
! 		$(MAKE) -C lib/dyn_gw_plain DESTDIR=$(DESTDIR) install
  
  secure:
! 		$(MAKE) -C lib/secure clean
! 		$(MAKE) -C lib/secure
! 		$(MAKE) -C lib/secure DESTDIR=$(DESTDIR) install
  
  pgraph:
! 		$(MAKE) -C lib/pgraph clean
! 		$(MAKE) -C lib/pgraph 
! 		$(MAKE) -C lib/pgraph DESTDIR=$(DESTDIR) install 
  
  bmf:
! 		$(MAKE) -C lib/bmf clean
! 		$(MAKE) -C lib/bmf 
! 		$(MAKE) -C lib/bmf DESTDIR=$(DESTDIR) install 
  
  quagga:
! 		$(MAKE) -C lib/quagga clean
! 		$(MAKE) -C lib/quagga 
! 		$(MAKE) -C lib/quagga DESTDIR=$(DESTDIR) install 
  
  
--- 126,183 ----
  
  libs: 
! 		$(MAKECMD) -C lib LIBDIR=$(LIBDIR)
  
  libs_clean clean_libs:
! 		$(MAKECMD) -C lib LIBDIR=$(LIBDIR) clean
  
  libs_install install_libs:
! 		$(MAKECMD) -C lib LIBDIR=$(LIBDIR) install
  
  httpinfo:
! 		$(MAKECMD) -C lib/httpinfo clean
! 		$(MAKECMD) -C lib/httpinfo 
! 		$(MAKECMD) -C lib/httpinfo DESTDIR=$(DESTDIR) install 
  
  tas:
! 		$(MAKECMD) -C lib/tas clean
! 		$(MAKECMD) -C lib/tas DESTDIR=$(DESTDIR) install
  
  dot_draw:
! 		$(MAKECMD) -C lib/dot_draw clean
! 		$(MAKECMD) -C lib/dot_draw DESTDIR=$(DESTDIR) install
  
  nameservice:
! 		$(MAKECMD) -C lib/nameservice clean
! 		$(MAKECMD) -C lib/nameservice DESTDIR=$(DESTDIR) install
  
  dyn_gw:
! 		$(MAKECMD) -C lib/dyn_gw clean
! 		$(MAKECMD) -C lib/dyn_gw
! 		$(MAKECMD) -C lib/dyn_gw DESTDIR=$(DESTDIR) install
  
  dyn_gw_plain:
! 		$(MAKECMD) -C lib/dyn_gw_plain clean
! 		$(MAKECMD) -C lib/dyn_gw_plain
! 		$(MAKECMD) -C lib/dyn_gw_plain DESTDIR=$(DESTDIR) install
  
  secure:
! 		$(MAKECMD) -C lib/secure clean
! 		$(MAKECMD) -C lib/secure
! 		$(MAKECMD) -C lib/secure DESTDIR=$(DESTDIR) install
  
  pgraph:
! 		$(MAKECMD) -C lib/pgraph clean
! 		$(MAKECMD) -C lib/pgraph 
! 		$(MAKECMD) -C lib/pgraph DESTDIR=$(DESTDIR) install 
  
  bmf:
! 		$(MAKECMD) -C lib/bmf clean
! 		$(MAKECMD) -C lib/bmf 
! 		$(MAKECMD) -C lib/bmf DESTDIR=$(DESTDIR) install 
  
  quagga:
! 		$(MAKECMD) -C lib/quagga clean
! 		$(MAKECMD) -C lib/quagga 
! 		$(MAKECMD) -C lib/quagga DESTDIR=$(DESTDIR) install