[Gnash-commit] gnash testsuite/server/Makefile.am libbase/Make...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/05/17 15:36:16

Modified files:
        testsuite/server: Makefile.am 
        libbase        : Makefile.am 

Log message:
                * testsuite/server/Makefile.am: Link in FFMPEG is configured to 
do so.
                * libbase/Makefile.am: Add path for ltdl.h.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/Makefile.am?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.66&r2=1.67

Patches:
Index: testsuite/server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- testsuite/server/Makefile.am        8 May 2007 21:26:48 -0000       1.29
+++ testsuite/server/Makefile.am        17 May 2007 15:36:16 -0000      1.30
@@ -29,6 +29,7 @@
         -I$(top_srcdir)/server  \
         -I$(top_srcdir)/server/parser  \
         -I$(top_srcdir)/server/vm  \
+       $(FFMPEG_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(NULL)
 
@@ -56,6 +57,10 @@
        $(top_builddir)/libamf/libgnashamf.la \
        $(NULL)
 
+if USE_FFMPEG_ENGINE
+       GNASH_LIBS += $(FFMPEG_LIBS)
+endif
+
 MatrixTest_SOURCES = MatrixTest.cpp
 MatrixTest_LDADD = \
        $(GNASH_LIBS) \

Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- libbase/Makefile.am 16 May 2007 15:58:21 -0000      1.66
+++ libbase/Makefile.am 17 May 2007 15:36:16 -0000      1.67
@@ -42,6 +42,7 @@
        $(Z_CFLAGS) \
        $(JPEG_CFLAGS) \
        $(BOOST_CFLAGS) \
+       $(INCLTDL) \
        $(NULL)
 
 # These headers get installed