Add glcpp to the build.

diff --git a/Makefile.am b/Makefile.am
index efed87a..f24f06d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,11 @@
 
 AUTOMAKE_OPTIONS = foreign
 
+SUBDIRS = glcpp
+
 bin_PROGRAMS = glsl
+
+glsl_LDADD = ./glcpp/libglcpp.la
 glsl_LDFLAGS = @LDFLAGS@ $(talloc_LIBS)
 glsl_SOURCES = \
        main.cpp \

diff --git a/configure.ac b/configure.ac
index 09c5f4b..68241f1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,10 @@ AC_PREREQ(2.61)
 AC_INIT(glsl, XXXXX, idr@freedesktop.org, glsl)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_CONFIG_HEADER([config.h])
+AC_CONFIG_FILES([glcpp/Makefile])
 
 AM_INIT_AUTOMAKE
+LT_INIT
 
 AM_MAINTAINER_MODE
 

diff --git a/glcpp/Makefile b/glcpp/Makefile
deleted file mode 100644 (file)
index 1578a8e..0000000
--- a/glcpp/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Debug symbols by default, but let the user avoid that with something
-# like "make CFLAGS=-O2"
-CFLAGS = -g
-
-# But we use 'override' here so that "make CFLAGS=-O2" will still have
-# all the warnings enabled.
-override CFLAGS += -Wall -Wextra -Wwrite-strings -Wswitch-enum -Wno-unused
-
-glcpp: glcpp.o glcpp-lex.o glcpp-parse.o hash_table.o xtalloc.o
-       gcc -o $@ -ltalloc -lm $^
-
-%.c %.h: %.y
-       bison --debug --defines=$*.h --output=$*.c $^
-
-%.c: %.l
-       flex --outfile=$@ $<
-
-glcpp-lex.c: glcpp-parse.h
-
-test: glcpp
-       @(cd tests; ./glcpp-test)
-
-clean:
-       rm -f glcpp glcpp-lex.c glcpp-parse.c *.o *~
-       rm -f tests/*.out tests/*~

diff --git a/glcpp/Makefile.am b/glcpp/Makefile.am
new file mode 100644 (file)
index 0000000..26b769c
--- /dev/null
+++ b/glcpp/Makefile.am
@@ -0,0 +1,45 @@
+# Copyright © 2010 Intel Corporation
+# All Rights Reserved.
+#
+# 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
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
+# AUTHORS, COPYRIGHT HOLDERS, AND/OR THEIR SUPPLIERS 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
+libglcpp_la_SOURCES = \
+       glcpp-lex.l \
+       glcpp-parse.y \
+       glcpp.h \
+       hash_table.c \
+       xtalloc.c
+
+BUILT_SOURCES = glcpp-parse.h glcpp-parse.c glcpp-lex.c
+CLEANFILES = $(BUILT_SOURCES)
+
+glcpp-parse.h: glcpp-parse.c
+
+bin_PROGRAMS = glcpp
+glcpp_LDADD = libglcpp.la
+glcpp_LDFLAGS = @LDFLAGS@ $(talloc_LIBS)
+glcpp_SOURCES = glcpp.c
+
+.l.c:
+       $(LEXCOMPILE) --outfile="$@" $<
+
+test: glcpp
+       @(cd tests; ./glcpp-test)