[Olsr-cvs] olsrd-current Makefile, 1.96, 1.97 Makefile.inc, 1.29, 1.30

[Bernd Petrovitsch]

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

Modified Files:
	Makefile Makefile.inc 
Log Message:
* creating builddata.c containing build time information as date+time,
  host and version
  and using it througout
* activated links in the httpinfo plugin again if we have host links
  other minor HTML cleanups there
* replaced the olsr_host_rt_maxplen() function with a field in
  "struct olsr_cfg" similar to "ipsize"


Index: Makefile
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** Makefile	13 Sep 2007 22:50:28 -0000	1.96
--- Makefile	16 Sep 2007 21:20:06 -0000	1.97
***************
*** 43,48 ****
  include Makefile.inc
  
- CPPFLAGS +=	-DVERSION=\"$(VERS)\"
- 
  # pass generated variables to save time
  MAKECMD = $(MAKE) OS="$(OS)" WARNINGS="$(WARNINGS)"
--- 43,46 ----
***************
*** 62,66 ****
  default_target: cfgparser $(EXENAME)
  
! $(EXENAME):	$(OBJS) $(CFGOBJS)
  		$(CC) $(LDFLAGS) -o $@ $(OBJS) $(CFGOBJS) $(LIBS)
  
--- 60,64 ----
  default_target: cfgparser $(EXENAME)
  
! $(EXENAME):	$(OBJS) $(CFGOBJS) src/builddata.o
  		$(CC) $(LDFLAGS) -o $@ $(OBJS) $(CFGOBJS) $(LIBS)
  
***************
*** 74,81 ****
  		$(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 
  
  clean:
! 		-rm -f $(OBJS) $(SRCS:%.c=%.d) $(EXENAME) $(EXENAME).exe
  ifeq ($(OS), win32)
  		-rm -f libolsrd.a
--- 72,89 ----
  		$(MAKECMD) -C $(CFGDIR)
  
+ # generate it always
+ .PHONY: src/builddata.c
+ src/builddata.c:
+ 	@$(RM) "$@"
+ 	@echo "#include \"defs.h\"" >> "$@" 
+ 	@echo "const char olsrd_version[] = \"olsr.org - $(VERS)\";" >> "$@" 
+ 	@date +"const char build_date[] = \"%Y-%m-%d %H:%M:%S\";" >> "$@" 
+ 	@echo "const char build_host[] = \"$(shell hostname)\";" >> "$@" 
+ 
+ 
  .PHONY: help libs clean_libs libs_clean clean uberclean install_libs libs_install install_bin install_olsrd install build_all install_all clean_all 
  
  clean:
! 		-rm -f $(OBJS) $(SRCS:%.c=%.d) $(EXENAME) $(EXENAME).exe src/builddata.c
  ifeq ($(OS), win32)
  		-rm -f libolsrd.a

Index: Makefile.inc
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile.inc,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Makefile.inc	7 Sep 2007 09:07:25 -0000	1.29
--- Makefile.inc	16 Sep 2007 21:20:06 -0000	1.30
***************
*** 45,49 ****
  WARNINGS +=	-Winline
  WARNINGS +=	-Wdisabled-optimization
! #WARNINGS +=	-Werror
  WARNINGS :=	$(shell CC="$(CC)" $(TOPDIR)/gcc-warnings $(WARNINGS))
  endif
--- 45,49 ----
  WARNINGS +=	-Winline
  WARNINGS +=	-Wdisabled-optimization
! WARNINGS +=	-Werror
  WARNINGS :=	$(shell CC="$(CC)" $(TOPDIR)/gcc-warnings $(WARNINGS))
  endif