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 9bd749b1e0c56555eb6134da9e99ed531df67c8e..cddfbf554eb87d1b359dc9d28f7f06d4ecf56780 100644 (file)
--- a/simgear/screen/Makefile.am
+++ b/simgear/screen/Makefile.am
@@ -2,11 +2,46 @@ includedir = @includedir@/screen
 
 lib_LIBRARIES = libsgscreen.a
 
-include_HEADERS = screen-dump.hxx
+EXTRA_DIST = jpgfactory.cxx jpgfactory.hxx
+
+if ENABLE_JPEG_SERVER
+IMAGE_SERVER_INCL = jpgfactory.hxx
+IMAGE_SERVER_SRCS = jpgfactory.cxx
+else
+IMAGE_SERVER_INCL = 
+IMAGE_SERVER_SRCS = 
+endif
+
+noinst_HEADERS = GLBitmaps.h
+
+include_HEADERS = \
+       colors.hxx \
+       $(IMAGE_SERVER_INCL) \
+       screen-dump.hxx \
+       extensions.hxx \
+       RenderTexture.h \
+       shader.h \
+       tr.h
 
 libsgscreen_a_SOURCES = \
-       GLBitmaps.cxx GLBitmaps.h \
+       GLBitmaps.cxx \
+       $(IMAGE_SERVER_SRCS) \
        screen-dump.cxx \
+       tr.cxx \
+       extensions.cxx \
+       RenderTexture.cpp \
+       shader.cpp \
        win32-printer.h
 
-# INCLUDES += -I$(top_builddir)/src
+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