egl: Add eglut build system and hook up the EGL demos that need it.

6 files changed, 51 insertions, 42 deletions

diff --git a/configure.ac b/configure.ac
index 77abfe6..0b6d634 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,6 +189,7 @@ AC_OUTPUT([
 	src/Makefile
 	src/demos/Makefile
 	src/egl/Makefile
+	src/egl/eglut/Makefile
 	src/egl/opengles1/Makefile
 	src/egl/opengles2/Makefile
 	src/fp/Makefile
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index 4b3a8ef..9fb06e1 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -22,6 +22,7 @@
 # Authors:
 #    Eric Anholt <eric@anholt.net>
 
-AUTOMAKE_OPTIONS = foreign
-
-SUBDIRS = opengles1 opengles2
+SUBDIRS = \
+	eglut \
+	opengles1 \
+	opengles2
diff --git a/src/egl/eglut/Makefile b/src/egl/eglut/Makefile
deleted file mode 100644
index 364f5b0..0000000
--- a/src/egl/eglut/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# progs/egl/eglut
-
-TOP = ../../..
-include $(TOP)/configs/current
-
-INCLUDES = \
-	-I$(TOP)/include \
-	$(X11_CFLAGS)
-
-SOURCES = \
-	eglut.c \
-	eglut_screen.c \
-	eglut_x11.c
-
-EGLUT_X11_OBJECTS = eglut.o eglut_x11.o
-EGLUT_SCREEN_OBJECTS = eglut.o eglut_screen.o
-
-default: depend libeglut-x11.a libeglut-screen.a
-
-libeglut-x11.a: $(EGLUT_X11_OBJECTS)
-	$(MKLIB) -o eglut-x11 -static $(EGLUT_X11_OBJECTS)
-
-libeglut-screen.a: $(EGLUT_SCREEN_OBJECTS)
-	$(MKLIB) -o eglut-screen -static $(EGLUT_SCREEN_OBJECTS)
-
-.c.o:
-	$(CC) -c -o $@ $< $(INCLUDES) $(DEFINES) $(CFLAGS)
-
-depend: $(SOURCES)
-	@rm -f depend
-	@touch depend
-	@$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) \
-		> /dev/null 2>/dev/null
-
-clean:
-	rm -f *.o *.a
-	rm -f depend depend.bak
-
-sinclude depend
diff --git a/src/egl/eglut/Makefile.am b/src/egl/eglut/Makefile.am
new file mode 100644
index 0000000..0c260c0
--- /dev/null
+++ b/src/egl/eglut/Makefile.am
@@ -0,0 +1,36 @@
+# Copyright © 2009 Intel Corporation
+#
+# 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.
+#
+# Authors:
+#    Eric Anholt <eric@anholt.net>
+
+AM_CFLAGS = \
+	$(DEMO_CFLAGS)
+
+if HAVE_EGL
+noinst_LTLIBRARIES = libeglut.la
+endif
+
+libeglut_la_SOURCES = \
+	eglut.c \
+	eglutint.h \
+	eglut_screen.c \
+	eglut_x11.c
diff --git a/src/egl/opengles1/Makefile.am b/src/egl/opengles1/Makefile.am
index 6126e45..bbe505c 100644
--- a/src/egl/opengles1/Makefile.am
+++ b/src/egl/opengles1/Makefile.am
@@ -29,6 +29,7 @@ AM_CFLAGS = \
 	$(DEMO_CFLAGS) \
 	$(EGL_CFLAGS) \
 	$(GLESV1_CFLAGS) \
+	-I$(top_srcdir)/src/egl/eglut \
 	-I$(top_srcdir)/src/util
 AM_LDFLAGS = \
 	$(DEMO_LIBS) \
@@ -41,6 +42,7 @@ noinst_PROGRAMS = \
 	bindtex \
 	drawtex \
 	es1_info \
+	gears \
 	msaa \
 	pbuffer\
 	render_tex \
@@ -49,3 +51,8 @@ noinst_PROGRAMS = \
 	two_win
 endif
 endif
+
+drawtex_LDADD = ../eglut/libeglut.la
+gears_LDADD = ../eglut/libeglut.la
+torus_LDADD = ../eglut/libeglut.la
+tri_LDADD = ../eglut/libeglut.la
diff --git a/src/egl/opengles2/Makefile.am b/src/egl/opengles2/Makefile.am
index ef90504..777f8b2 100644
--- a/src/egl/opengles2/Makefile.am
+++ b/src/egl/opengles2/Makefile.am
@@ -29,6 +29,7 @@ AM_CFLAGS = \
 	$(DEMO_CFLAGS) \
 	$(EGL_CFLAGS) \
 	$(GLESV2_CFLAGS) \
+	-I$(top_srcdir)/src/egl/eglut \
 	-I$(top_srcdir)/src/util
 AM_LDFLAGS = \
 	$(DEMO_LIBS) \
@@ -43,3 +44,5 @@ noinst_PROGRAMS = \
 	tri
 endif
 endif
+
+es2gears_LDADD = ../eglut/libeglut.la