[lwatch-cvs] files/src Makefile.in,1.15,1.16 config.h.in,1.13,1.14 yparse.l,1.19,1.20
Brought to you by:
arturcz
|
From: <ar...@us...> - 2004-01-03 23:05:21
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4155/src
Modified Files:
Makefile.in config.h.in yparse.l
Log Message:
input_fifo is obsoleted
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/src/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.in 4 Apr 2003 22:16:36 -0000 1.15
--- Makefile.in 3 Jan 2004 23:05:13 -0000 1.16
***************
*** 1,6 ****
! # Makefile.in generated by automake 1.7.2 from Makefile.am.
# @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
--- 1,6 ----
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
***************
*** 92,95 ****
--- 92,96 ----
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
***************
*** 133,136 ****
--- 134,138 ----
CLEANFILES = yparse.c stamp-h.in *~
subdir = src
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
***************
*** 162,167 ****
DATA = $(dist_sysconf_DATA)
! DIST_COMMON = $(dist_sysconf_DATA) Makefile.am Makefile.in config.h.in \
! yparse.c
SOURCES = $(lwatch_SOURCES)
--- 164,169 ----
DATA = $(dist_sysconf_DATA)
! DIST_COMMON = $(dist_sysconf_DATA) $(srcdir)/Makefile.in Makefile.am \
! config.h.in yparse.c
SOURCES = $(lwatch_SOURCES)
***************
*** 234,244 ****
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yparse.Po@am__quote@
- distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
--- 236,243 ----
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yparse.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
***************
*** 251,255 ****
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
! @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
--- 250,254 ----
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
***************
*** 374,378 ****
installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir)
-
install: install-am
install-exec: install-exec-am
--- 373,376 ----
***************
*** 386,390 ****
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
--- 384,388 ----
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
***************
*** 395,399 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
--- 393,397 ----
distclean-generic:
! -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
***************
*** 406,412 ****
distclean: distclean-am
!
! distclean-am: clean-am distclean-compile distclean-depend \
! distclean-generic distclean-hdr distclean-tags
dvi: dvi-am
--- 404,411 ----
distclean: distclean-am
! -rm -rf ./$(DEPDIR)
! -rm -f Makefile
! distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \
! distclean-tags
dvi: dvi-am
***************
*** 429,433 ****
maintainer-clean: maintainer-clean-am
!
maintainer-clean-am: distclean-am maintainer-clean-generic
--- 428,433 ----
maintainer-clean: maintainer-clean-am
! -rm -rf ./$(DEPDIR)
! -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
***************
*** 449,462 ****
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic ctags distclean distclean-compile \
! distclean-depend distclean-generic distclean-hdr distclean-tags \
! distdir dvi dvi-am info info-am install install-am \
! install-binPROGRAMS install-data install-data-am \
! install-dist_sysconfDATA install-exec install-exec-am \
! install-info install-info-am install-man install-strip \
! installcheck installcheck-am installdirs maintainer-clean \
! maintainer-clean-generic mostlyclean mostlyclean-compile \
! mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
! uninstall-am uninstall-binPROGRAMS uninstall-dist_sysconfDATA \
! uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 449,461 ----
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic ctags distclean distclean-compile \
! distclean-generic distclean-hdr distclean-tags distdir dvi \
! dvi-am info info-am install install-am install-binPROGRAMS \
! install-data install-data-am install-dist_sysconfDATA \
! install-exec install-exec-am install-info install-info-am \
! install-man install-strip installcheck installcheck-am \
! installdirs maintainer-clean maintainer-clean-generic \
! mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
! ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \
! uninstall-dist_sysconfDATA uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: config.h.in
===================================================================
RCS file: /cvsroot/lwatch/files/src/config.h.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** config.h.in 25 Mar 2003 13:15:48 -0000 1.13
--- config.h.in 3 Jan 2004 23:05:13 -0000 1.14
***************
*** 1,133 ****
/* src/config.h.in. Generated from configure.ac by autoheader. */
! /* Define to 1 if you want to compile with debug support. */
#undef DEBUG
! /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT
! /* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H
! /* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
! /* Define to 1 if you have the <getopt.h> header file. */
#undef HAVE_GETOPT_H
! /* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
! /* Define to 1 if you have the `pcre' library (-lpcre). */
#undef HAVE_LIBPCRE
! /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
! to 0 otherwise. */
#undef HAVE_MALLOC
! /* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
! /* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
! /* Define to 1 if you have the <pcre.h> header file. */
#undef HAVE_PCRE_H
! /* Define to 1 if your system has a GNU libc compatible `realloc' function,
! and to 0 otherwise. */
#undef HAVE_REALLOC
! /* Define to 1 if you have the <signal.h> header file. */
#undef HAVE_SIGNAL_H
! /* Define to 1 if you have the <stdarg.h> header file. */
#undef HAVE_STDARG_H
! /* Define to 1 if you have the <stddef.h> header file. */
#undef HAVE_STDDEF_H
! /* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
! /* Define to 1 if you have the <stdio.h> header file. */
#undef HAVE_STDIO_H
! /* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
! /* Define to 1 if you have the `strcasecmp' function. */
#undef HAVE_STRCASECMP
! /* Define to 1 if you have the `strchr' function. */
#undef HAVE_STRCHR
! /* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
! /* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
! /* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
! /* Define to 1 if you have the <sys/poll.h> header file. */
#undef HAVE_SYS_POLL_H
! /* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
! /* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
! /* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
! /* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
! /* Default input file */
#undef INPUTFILE
! /* Name of package */
#undef PACKAGE
! /* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
! /* Define to the full name of this package. */
#undef PACKAGE_NAME
! /* Define to the full name and version of this package. */
#undef PACKAGE_STRING
! /* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
! /* Define to the version of this package. */
#undef PACKAGE_VERSION
! /* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
! /* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
! /* Directory where configuration file is placed */
#undef SYSCONFDIR
! /* Version number of package */
#undef VERSION
! /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
! `char[]'. */
#undef YYTEXT_POINTER
! /* Define to empty if `const' does not conform to ANSI C. */
#undef const
! /* Define to rpl_malloc if the replacement function should be used. */
#undef malloc
! /* Define to rpl_realloc if the replacement function should be used. */
#undef realloc
--- 1,213 ----
/* src/config.h.in. Generated from configure.ac by autoheader. */
! /*
! Define to 1 if you want to compile
! with debug support. */
#undef DEBUG
! /*
! Define to 1 if you don't have `vprintf'
! but do have `_doprnt.' */
#undef HAVE_DOPRNT
! /*
! Define to 1 if you have the <errno.h>
! header file. */
#undef HAVE_ERRNO_H
! /*
! Define to 1 if you have the <fcntl.h>
! header file. */
#undef HAVE_FCNTL_H
! /*
! Define to 1 if you have the <getopt.h>
! header file. */
#undef HAVE_GETOPT_H
! /*
! Define to 1 if you have the <inttypes.h>
! header file. */
#undef HAVE_INTTYPES_H
! /*
! Define to 1 if you have the `pcre'
! library (-lpcre). */
#undef HAVE_LIBPCRE
! /*
! Define to 1 if your system has a
! GNU libc compatible `malloc' function, and to 0 otherwise.
! */
#undef HAVE_MALLOC
! /*
! Define to 1 if you have the <memory.h>
! header file. */
#undef HAVE_MEMORY_H
! /*
! Define to 1 if you have the `memset'
! function. */
#undef HAVE_MEMSET
! /*
! Define to 1 if you have the <pcre.h>
! header file. */
#undef HAVE_PCRE_H
! /*
! Define to 1 if your system has a
! GNU libc compatible `realloc' function, and to 0 otherwise.
! */
#undef HAVE_REALLOC
! /*
! Define to 1 if you have the <signal.h>
! header file. */
#undef HAVE_SIGNAL_H
! /*
! Define to 1 if you have the <stdarg.h>
! header file. */
#undef HAVE_STDARG_H
! /*
! Define to 1 if you have the <stddef.h>
! header file. */
#undef HAVE_STDDEF_H
! /*
! Define to 1 if you have the <stdint.h>
! header file. */
#undef HAVE_STDINT_H
! /*
! Define to 1 if you have the <stdio.h>
! header file. */
#undef HAVE_STDIO_H
! /*
! Define to 1 if you have the <stdlib.h>
! header file. */
#undef HAVE_STDLIB_H
! /*
! Define to 1 if you have the `strcasecmp'
! function. */
#undef HAVE_STRCASECMP
! /*
! Define to 1 if you have the `strchr'
! function. */
#undef HAVE_STRCHR
! /*
! Define to 1 if you have the <strings.h>
! header file. */
#undef HAVE_STRINGS_H
! /*
! Define to 1 if you have the <string.h>
! header file. */
#undef HAVE_STRING_H
! /*
! Define to 1 if you have the <sys/param.h>
! header file. */
#undef HAVE_SYS_PARAM_H
! /*
! Define to 1 if you have the <sys/poll.h>
! header file. */
#undef HAVE_SYS_POLL_H
! /*
! Define to 1 if you have the <sys/stat.h>
! header file. */
#undef HAVE_SYS_STAT_H
! /*
! Define to 1 if you have the <sys/types.h>
! header file. */
#undef HAVE_SYS_TYPES_H
! /*
! Define to 1 if you have the <unistd.h>
! header file. */
#undef HAVE_UNISTD_H
! /*
! Define to 1 if you have the `vprintf'
! function. */
#undef HAVE_VPRINTF
! /*
! Default input file */
#undef INPUTFILE
! /*
! Name of package */
#undef PACKAGE
! /*
! Define to the address where bug reports for
! this package should be sent. */
#undef PACKAGE_BUGREPORT
! /*
! Define to the full name of this package.
! */
#undef PACKAGE_NAME
! /*
! Define to the full name and version of
! this package. */
#undef PACKAGE_STRING
! /*
! Define to the one symbol short name of
! this package. */
#undef PACKAGE_TARNAME
! /*
! Define to the version of this package. */
#undef PACKAGE_VERSION
! /*
! Define as the return type of signal handlers
! (`int' or `void'). */
#undef RETSIGTYPE
! /*
! Define to 1 if you have the ANSI
! C header files. */
#undef STDC_HEADERS
! /*
! Directory where configuration file is placed */
#undef SYSCONFDIR
! /*
! Version number of package */
#undef VERSION
! /*
! Define to 1 if `lex' declares `yytext' as
! a `char *' by default, not a `char[]'. */
#undef YYTEXT_POINTER
! /*
! Define to empty if `const' does not conform
! to ANSI C. */
#undef const
! /*
! Define to rpl_malloc if the replacement function should
! be used. */
#undef malloc
! /*
! Define to rpl_realloc if the replacement function should
! be used. */
#undef realloc
Index: yparse.l
===================================================================
RCS file: /cvsroot/lwatch/files/src/yparse.l,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** yparse.l 10 Nov 2003 01:15:05 -0000 1.19
--- yparse.l 3 Jan 2004 23:05:13 -0000 1.20
***************
*** 102,111 ****
<*>{COMMENT} ; /* Skip comments */
<INITIAL>input_fifo= {
! printf("lwatch.conf: OPTION input_fifo IN LINE %i IS DEPRECATED.\nUSE input_file INSTEAD IT.\n",lineno);
! yypch=lw_conf.in_file;
! #ifdef DEBUG
! strcpy(mymsg,"input_file");
! #endif
! PUSH(TEXT);
}
<INITIAL>input_file= {
--- 102,106 ----
<*>{COMMENT} ; /* Skip comments */
<INITIAL>input_fifo= {
! die("lwatch.conf: OPTION input_fifo IN LINE %i IS DEPRECATED.\nUSE input_file INSTEAD IT.\n",lineno);
}
<INITIAL>input_file= {
|