diff options
author | Manoj Srivastava <srivasta@debian.org> | 2016-01-22 13:51:30 -0800 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2016-01-22 13:51:30 -0800 |
commit | f753f2b7b6d97014110dbe418861353a2f3f445d (patch) | |
tree | 7f248ce2f59fbb79cab24b4727955e37e9a5ab81 /tests/test-concatenated-options/Makefile.am | |
parent | 306163051847aaaabe7ae0f4cfc7d23f15923f3a (diff) | |
parent | a646b6cd438dc4bd957c6c6afd89b5e8e59468fe (diff) |
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
# Conflicts:
# INSTALL
# Makefile.in
# aclocal.m4
# build-aux/compile
# build-aux/config.guess
# build-aux/config.sub
# build-aux/depcomp
# build-aux/install-sh
# build-aux/mdate-sh
# build-aux/texinfo.tex
# configure
# doc/Makefile.in
# doc/flex.1
# doc/flex.info
# doc/flex.info-1
# doc/flex.info-2
# doc/flex.pdf
# doc/stamp-vti
# doc/version.texi
# examples/Makefile.in
# examples/fastwc/Makefile.in
# examples/manual/Makefile.in
# src/config.h.in
# tests/Makefile.in
# tests/test-bison-nr/Makefile.am
# tests/test-bison-yylloc/Makefile.am
# tests/test-bison-yylval/Makefile.am
# tools/Makefile.in
Diffstat (limited to 'tests/test-concatenated-options/Makefile.am')
-rw-r--r-- | tests/test-concatenated-options/Makefile.am | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/tests/test-concatenated-options/Makefile.am b/tests/test-concatenated-options/Makefile.am deleted file mode 100644 index e392073..0000000 --- a/tests/test-concatenated-options/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -# This file is part of flex. - -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: - -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. - -# Neither the name of the University nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. - -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE. - -FLEX = $(top_builddir)/flex$(EXEEXT) - -CLEANFILES = OUTPUT - -# The test below just wants to know if flex can process multiple -# concatenated options. The -c and -n options both do nothing, so we -# group them together to see if flex will still function. We write the -# output to /dev/null since we don't really care what flex produces, -# just that it runs successfully. - -test: - echo %% | $(FLEX) -cn -o /dev/null |