[Gnash-commit] gnash ChangeLog libbase/Makefile.am

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/26 17:12:56

Modified files:
        .              : ChangeLog 
        libbase        : Makefile.am 

Log message:
        * libbase/Makefile.am: don't build ogl.cpp when not using OPENGL 
rendered. Don't build tu_file_SDL.cpp if HAS_SDL is not set.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.527&r2=1.528
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.527
retrieving revision 1.528
diff -u -b -r1.527 -r1.528
--- ChangeLog   26 Jul 2006 14:18:14 -0000      1.527
+++ ChangeLog   26 Jul 2006 17:12:56 -0000      1.528
@@ -1,6 +1,8 @@
 
 2006-07-26 Sandro Santilli <address@hidden>
 
+       * libbase/Makefile.am: don't build ogl.cpp when not using OPENGL
+         rendered. Don't build tu_file_SDL.cpp if HAS_SDL is not set.
        * configure.ac: don't complain about missing SDL_Mixer
          if Gstreamer sound is requested
 

Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- libbase/Makefile.am 7 Jun 2006 03:03:22 -0000       1.30
+++ libbase/Makefile.am 26 Jul 2006 17:12:56 -0000      1.31
@@ -39,6 +39,8 @@
 
 AUTOMAKE_OPTIONS = 
 
+EXTRA_DIST = 
+
 INCLUDES = -I.. -I$(srcdir) \
         -I$(top_srcdir)        \
        -I$(top_srcdir)/server\
@@ -65,6 +67,18 @@
 DMALLOC_FILE = dlmalloc.c
 endif
 
+if USE_RENDERER_OPENGL
+OPENGL_SOURCES = ogl.cpp
+else
+EXTRA_DIST += ogl.cpp
+endif
+
+if HAS_SDL
+SDL_FILE = tu_file_SDL.cpp
+else
+EXTRA_DIST += tu_file_SDL.cpp
+endif
+
 libgnashbase_la_SOURCES = \
        config.cpp \
        container.cpp \
@@ -74,13 +88,13 @@
        jpeg.cpp \
        log.cpp \
        membuf.cpp \
-       ogl.cpp \
+       $(OPENGL_SOURCES) \
        postscript.cpp \
        rc.cpp \
        triangulate_float.cpp \
        triangulate_sint32.cpp \
        tu_file.cpp \
-       tu_file_SDL.cpp \
+       $(SDL_FILE) \
        tu_random.cpp \
        tu_timer.cpp \
        tu_types.cpp \