From: Hans-Bernhard B. <br...@us...> - 2006-09-30 20:29:17
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21832/src Modified Files: Makefile.am Makefile.in fscanner.l Log Message: Allow non-Unix linebreak characters in more places (fix #1563459). Index: Makefile.am =================================================================== RCS file: /cvsroot/cscope/cscope/src/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** Makefile.am 30 Sep 2006 17:31:14 -0000 1.11 --- Makefile.am 30 Sep 2006 20:29:14 -0000 1.12 *************** *** 35,39 **** ## Hack to clean the generated files and not include them in a "make dist". ! # CLEANFILES = scanner.c fscanner.c egrep.c #dist-hook: # rm -f $(distdir)/scanner.c $(distdir)/fscanner.c $(distdir)/egrep.c --- 35,39 ---- ## Hack to clean the generated files and not include them in a "make dist". ! CLEANFILES = scanner.c fscanner.c egrep.c #dist-hook: # rm -f $(distdir)/scanner.c $(distdir)/fscanner.c $(distdir)/egrep.c Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/src/Makefile.in,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** Makefile.in 30 Sep 2006 17:31:14 -0000 1.13 --- Makefile.in 30 Sep 2006 20:29:14 -0000 1.14 *************** *** 229,234 **** cscope_LDADD = $(CURSES_LIBS) $(LEXLIB) AM_CPPFLAGS = $(CURSES_INCLUDEDIR) ! ! # CLEANFILES = scanner.c fscanner.c egrep.c #dist-hook: # rm -f $(distdir)/scanner.c $(distdir)/fscanner.c $(distdir)/egrep.c --- 229,233 ---- cscope_LDADD = $(CURSES_LIBS) $(LEXLIB) AM_CPPFLAGS = $(CURSES_INCLUDEDIR) ! CLEANFILES = scanner.c fscanner.c egrep.c #dist-hook: # rm -f $(distdir)/scanner.c $(distdir)/fscanner.c $(distdir)/egrep.c *************** *** 893,896 **** --- 892,896 ---- clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: Index: fscanner.l =================================================================== RCS file: /cvsroot/cscope/cscope/src/fscanner.l,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** fscanner.l 23 Jul 2006 20:59:20 -0000 1.11 --- fscanner.l 30 Sep 2006 20:29:14 -0000 1.12 *************** *** 131,135 **** comment "/*"([^*]*("*"+[^/])?)*"*/"|"//"[^\n]*\n ws [ \t\r\v\f] ! wsnl [ \t\n]|{comment} /* flex options: stack of start conditions, and don't use yywrap() */ --- 131,135 ---- comment "/*"([^*]*("*"+[^/])?)*"*/"|"//"[^\n]*\n ws [ \t\r\v\f] ! wsnl [ \t\r\v\f\n]|{comment} /* flex options: stack of start conditions, and don't use yywrap() */ |