From 6406e381655cdfbf271009c578377a14be459de7 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Sun, 27 Mar 2011 14:50:57 -0700 Subject: [PATCH] Move the logic out for building the parser. --- libmemcached/options/include.am | 15 +-------------- libmemcached/options/parser.am | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 libmemcached/options/parser.am diff --git a/libmemcached/options/include.am b/libmemcached/options/include.am index 562a3278..040c1c1e 100644 --- a/libmemcached/options/include.am +++ b/libmemcached/options/include.am @@ -9,10 +9,6 @@ DISTCLEANFILES+= \ libmemcached/options/scanner.cc \ libmemcached/options/scanner.h -EXTRA_DIST+= \ - libmemcached/options/scanner.l \ - libmemcached/options/parser.yy - noinst_HEADERS+= \ libmemcached/options/build.h \ libmemcached/options/context.h \ @@ -27,13 +23,4 @@ libmemcached_libmemcached_la_SOURCES+= \ libmemcached/options/parser.cc \ libmemcached/options/scanner.cc -libmemcached/options/parser.h: libmemcached/options/parser.cc - -libmemcached/options/parser.cc: libmemcached/options/parser.yy libmemcached/options/scanner.l libmemcached/options/scanner.h - $(AM_V_YACC)$(am__skipyacc) $(YACC) $(YLFLAGS) $(AM_YFLAGS) -o $@ $< - -libmemcached/options/scanner.h: libmemcached/options/scanner.cc - -libmemcached/options/scanner.cc: libmemcached/options/scanner.l libmemcached/options/parser.yy - $(AM_V_GEN)$(LEX) $< - +include libmemcached/options/parser.am diff --git a/libmemcached/options/parser.am b/libmemcached/options/parser.am new file mode 100644 index 00000000..7bfd21c7 --- /dev/null +++ b/libmemcached/options/parser.am @@ -0,0 +1,29 @@ +# vim:expandtab:shiftwidth=2:tabstop=2:smarttab: +# +# Libmemcached Scanner and Parser +# +# Copyright (C) 2011 DataDifferental, http://datadifferential.com +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + + +libmemcached/options/parser.h: libmemcached/options/parser.cc + +libmemcached/options/parser.cc: libmemcached/options/parser.yy libmemcached/options/scanner.l libmemcached/options/scanner.h + $(AM_V_YACC)$(am__skipyacc) $(YACC) $(YLFLAGS) $(AM_YFLAGS) -o $@ $< + +libmemcached/options/scanner.h: libmemcached/options/scanner.cc + +libmemcached/options/scanner.cc: libmemcached/options/scanner.l libmemcached/options/parser.yy + $(AM_V_GEN)$(LEX) $< -- 2.30.2