[Olsr-cvs] olsrd-current list-excludes.sh, NONE, 1.1 .cvsignore, 1.1, 1.2 Makefile, 1.74, 1.75

[Bernd Petrovitsch]

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

Modified Files:
	.cvsignore Makefile 
Added Files:
	list-excludes.sh 
Log Message:
* added a "rpm" target to produce a olsrd-current.<arch>.rpm
* added a quagga target similar to all the others
* pass the DESTDIR variable down
* fixed makefile output of the cfgfilename
* do not change the local olsrd binary but inly the installed one


Index: .cvsignore
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .cvsignore	21 Oct 2006 21:40:49 -0000	1.1
--- .cvsignore	5 Feb 2007 21:17:26 -0000	1.2
***************
*** 1,2 ****
--- 1,3 ----
  olsrd
  *.d
+ olsrd-current.tar.bz2

--- NEW FILE: list-excludes.sh ---
(This appears to be a binary file; contents omitted.)

Index: Makefile
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** Makefile	31 Jan 2007 12:36:49 -0000	1.74
--- Makefile	5 Feb 2007 21:17:26 -0000	1.75
***************
*** 86,96 ****
  
  install_bin:
- 		$(STRIP) $(EXENAME)
  		mkdir -p $(SBINDIR)
  		install -m 755 $(EXENAME) $(SBINDIR)
  
  install_olsrd:	install_bin
  		@echo ========= C O N F I G U R A T I O N - F I L E ============
! 		@echo olsrd uses the configfile $(DESTDIR)/etc/olsr.conf
  		@echo a default configfile. A sample RFC-compliance aimed
  		@echo configfile can be installed. Note that a LQ-based configfile
--- 86,96 ----
  
  install_bin:
  		mkdir -p $(SBINDIR)
  		install -m 755 $(EXENAME) $(SBINDIR)
+ 		$(STRIP) $(SBINDIR)/$(EXENAME)
  
  install_olsrd:	install_bin
  		@echo ========= C O N F I G U R A T I O N - F I L E ============
! 		@echo olsrd uses the configfile $(CFGFILE)
  		@echo a default configfile. A sample RFC-compliance aimed
  		@echo configfile can be installed. Note that a LQ-based configfile
***************
*** 111,114 ****
--- 111,120 ----
  		$(TAGCMD) -o $(TAGFILE) $(TAG_SRCS)
  
+ rpm:
+ 		@$(RM) olsrd-current.tar.bz2
+ 		@echo "Creating olsrd-current.tar.bz2 ..."
+ 		@./list-excludes.sh | tar  --exclude-from=- --exclude="olsrd-current.tar.bz2" -C .. -cjf olsrd-current.tar.bz2 olsrd-current
+ 		@echo "Building RPMs..."
+ 		@rpmbuild -ta olsrd-current.tar.bz2
  #
  # PLUGINS
***************
*** 127,168 ****
  		$(MAKE) -C lib/httpinfo clean
  		$(MAKE) -C lib/httpinfo 
! 		$(MAKE) -C lib/httpinfo install 
  
  tas:
  		$(MAKE) -C lib/tas clean
! 		$(MAKE) -C lib/tas install
  
  dot_draw:
  		$(MAKE) -C lib/dot_draw clean
! 		$(MAKE) -C lib/dot_draw install
  
  nameservice:
  		$(MAKE) -C lib/nameservice clean
! 		$(MAKE) -C lib/nameservice install
  
  dyn_gw:
  		$(MAKE) -C lib/dyn_gw clean
  		$(MAKE) -C lib/dyn_gw
! 		$(MAKE) -C lib/dyn_gw install
  
  dyn_gw_plain:
  		$(MAKE) -C lib/dyn_gw_plain clean
  		$(MAKE) -C lib/dyn_gw_plain
! 		$(MAKE) -C lib/dyn_gw_plain install
  
  secure:
  		$(MAKE) -C lib/secure clean
  		$(MAKE) -C lib/secure
! 		$(MAKE) -C lib/secure install
  
  pgraph:
  		$(MAKE) -C lib/pgraph clean
  		$(MAKE) -C lib/pgraph 
! 		$(MAKE) -C lib/pgraph install 
  
  bmf:
  		$(MAKE) -C lib/bmf clean
  		$(MAKE) -C lib/bmf 
! 		$(MAKE) -C lib/bmf install 
  
  build_all:	cfgparser olsrd libs
--- 133,180 ----
  		$(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 
! 
  
  build_all:	cfgparser olsrd libs