diff options
| author | Matt Turner <[email protected]> | 2012-01-31 21:33:59 -0500 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-01-31 21:33:59 -0500 |
| commit | a99164956f1ade01909123ba196ef01282f41675 (patch) | |
| tree | bc027e24a9767523c90441457aca21b1d06f36df /src/glsl/glcpp | |
| parent | 70dd17152dca228675f955da41bc9d285c6177d4 (diff) | |
Revert "automake: src/glsl and src/glsl/glcpp"
This reverts commit 9947656168d09f9019600fccc42ca8e0de49b83a.
Diffstat (limited to 'src/glsl/glcpp')
| -rw-r--r-- | src/glsl/glcpp/.gitignore | 3 | ||||
| -rw-r--r-- | src/glsl/glcpp/Makefile.am | 44 |
2 files changed, 0 insertions, 47 deletions
diff --git a/src/glsl/glcpp/.gitignore b/src/glsl/glcpp/.gitignore index 4a14d48cde4..fb0be2065b4 100644 --- a/src/glsl/glcpp/.gitignore +++ b/src/glsl/glcpp/.gitignore @@ -1,5 +1,3 @@ -Makefile -Makefile.in glcpp glcpp-lex.c glcpp-parse.output @@ -8,7 +6,6 @@ glcpp-parse.h *.o *.lo *.la -.deps .libs *~ tests/*.out diff --git a/src/glsl/glcpp/Makefile.am b/src/glsl/glcpp/Makefile.am deleted file mode 100644 index 198908c6f2a..00000000000 --- a/src/glsl/glcpp/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ - - -# Copyright © 2012 Matt Turner <[email protected]> -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -noinst_LTLIBRARIES = libglcpp.la -check_PROGRAMS = glcpp - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/mesa \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/include - -BUILT_SOURCES = glcpp-parse.h -AM_YFLAGS = -d -AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c - -libglcpp_la_SOURCES = \ - glcpp-lex.l \ - glcpp-parse.y \ - pp.c \ - ../../mesa/program/hash_table.c \ - ../ralloc.c - -glcpp_SOURCES = glcpp.c -glcpp_LDADD = libglcpp.la |