Merge branches 'ehofman/propfix' and 'ehofman/sound'

[simgear.git] / simgear / screen / Makefile.am

diff --git a/simgear/screen/Makefile.am b/simgear/screen/Makefile.am
index 155d1fe495a226284a9f9f6316d331d46fde18d2..cddfbf554eb87d1b359dc9d28f7f06d4ecf56780 100644 (file)
--- a/simgear/screen/Makefile.am
+++ b/simgear/screen/Makefile.am
@@ -12,11 +12,10 @@ IMAGE_SERVER_INCL =
 IMAGE_SERVER_SRCS = 
 endif
 
-noinst_HEADERS = colours.h GLBitmaps.h
+noinst_HEADERS = GLBitmaps.h
 
 include_HEADERS = \
        colors.hxx \
-       texture.hxx \
        $(IMAGE_SERVER_INCL) \
        screen-dump.hxx \
        extensions.hxx \
@@ -25,7 +24,6 @@ include_HEADERS = \
        tr.h
 
 libsgscreen_a_SOURCES = \
-       texture.cxx \
        GLBitmaps.cxx \
        $(IMAGE_SERVER_SRCS) \
        screen-dump.cxx \
@@ -35,4 +33,15 @@ libsgscreen_a_SOURCES = \
        shader.cpp \
        win32-printer.h
 
-INCLUDES = -I$(top_srcdir) -DGLX_GLXEXT_PROTOTYPES
+if HAVE_GLUT
+noinst_PROGRAMS = TestRenderTexture
+
+TestRenderTexture_SOURCES = TestRenderTexture.cpp
+
+TestRenderTexture_LDADD = \
+       libsgscreen.a \
+       $(top_builddir)/simgear/debug/libsgdebug.a \
+       $(opengl_LIBS)
+endif
+
+INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGLX_GLXEXT_PROTOTYPES