[Olsr-cvs] olsrd-current/src/cfgparser local.mk, NONE, 1.1 Makefile, 1.30, 1.31

[Bernd Petrovitsch]

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

Modified Files:
	Makefile 
Added Files:
	local.mk 
Log Message:
* added a TMPFILES variable. Place all files there which should be removed on
  a "clean" (which are usually temporary files - thus the name).
* Killed the recursive make of the src/cfgparser directory
 - extracted the directory-local dependencies etc. into src/cfgparser/local.mk
   src/cfgparser/Makefile retains all of the rest to build in the local directory.
   Does actually anyone need that?
 - include'ing that in Makefile
 - removed all special handling/casing of cfgparser parts in Makefile
* cleanup: plugin rules are now all more similar


Index: Makefile
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Makefile	17 Sep 2007 21:44:15 -0000	1.30
--- Makefile	4 Nov 2007 19:07:43 -0000	1.31
***************
*** 42,47 ****
  include $(TOPDIR)/Makefile.inc
  
! SRCS =		olsrd_conf.c  oparse.c  oscan.c cfgfile_gen.c
! HDRS =		olsrd_conf.h  oparse.h
  
  ifeq ($(OS), win32)
--- 42,50 ----
  include $(TOPDIR)/Makefile.inc
  
! # delete the variables from above
! SRCS =
! HDRS =
! 
! include local.mk
  
  ifeq ($(OS), win32)
***************
*** 83,87 ****
--- 86,92 ----
  endif
  
+ .PHONY: install clean uberclean
  
+ # Targets
  default_target: $(NAME)
  
***************
*** 89,113 ****
  		$(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS)
  
- oscan.c:	oscan.lex Makefile
- 		$(FLEX) -Cem -ooscan.c-tmp oscan.lex
- 		sed	-e '/^static/s/yy_get_next_buffer[\(][\)]/yy_get_next_buffer(void)/' \
- 			-e '/^static/s/yy_get_previous_state[\(][\)]/yy_get_previous_state(void)/' \
- 			-e '/^static/s/yygrowstack[\(][\)]/yygrowstack(void)/' \
- 			-e '/^static/s/input[\(][\)]/input(void)/' \
- 			-e '/^static  *void  *yy_fatal_error/s/^\(.*)\);$$/\1 __attribute__((noreturn));/' \
- 			-e '/^#line/s/$(subst .,\.,$@-tmp)/$@/' \
- 			< oscan.c-tmp >oscan.c
- 		$(RM) oscan.c-tmp
- 
- oscan.o: CFLAGS := $(filter-out -Wunreachable-code -Wsign-compare, $(CFLAGS)) -Wno-sign-compare
- 
- oparse.c:	oparse.y olsrd_conf.h Makefile
- 		$(BISON) -d -o oparse.c oparse.y
- 
- oparse.o: CFLAGS := $(filter-out -Wunreachable-code, $(CFLAGS))
- 
- 
- .PHONY: install clean uberclean
- 
  install:
  		install -D -m 755 $(NAME) $(LIBDIR)/$(NAME)
--- 94,97 ----
***************
*** 115,123 ****
  
  clean:
! 		rm -f *.[od~] oscan.c oparse.[ch]
! 		rm -f $(LIBNAME)
! 		rm -f $(BINNAME)
! 		$(RM) oparse.c-tmp
  
  uberclean:	clean
- 		rm -f oparse.c oparse.h oscan.c
--- 99,103 ----
  
  clean:
! 		rm -f *.[od~] $(LIBNAME) $(BINNAME) $(TMPFILES)
  
  uberclean:	clean

--- NEW FILE: local.mk ---
(This appears to be a binary file; contents omitted.)