[Gnash-commit] /srv/bzr/gnash/trunk r9692: Fixed make check

[Markus Gothe]

------------------------------------------------------------
revno: 9692
committer: Markus Gothe <address@hidden>
branch nick: gnash
timestamp: Sun 2008-09-07 15:30:34 +0200
message:
  Fixed make check
modified:
  cygnal/Makefile.am
  cygnal/crc.cpp
  cygnal/testsuite/cygnal.all/Makefile.am

=== modified file 'cygnal/Makefile.am'
--- a/cygnal/Makefile.am        2008-08-19 01:28:22 +0000
+++ b/cygnal/Makefile.am        2008-09-07 13:30:34 +0000
@@ -56,13 +56,10 @@
         -I$(top_srcdir)/libcore \
         -DLOCALEDIR=\"$(localedir)\" \
         $(LIBXML_CFLAGS) \
-       $(DMALLOC_CFLAGS) \
-       $(CURL_CFLAGS) \
-       $(BOOST_CFLAGS) \
-       $(PTHREAD_CFLAGS)
-
-# noinst_LTLIBRARIES = libcygnal.la
-# libcygnal_la_LIBADD = $(AM_LDFLAGS)
+               $(DMALLOC_CFLAGS) \
+               $(CURL_CFLAGS) \
+               $(BOOST_CFLAGS) \
+               $(PTHREAD_CFLAGS)
 
 noinst_HEADERS = \
        crc.h

=== modified file 'cygnal/crc.cpp'
--- a/cygnal/crc.cpp    2008-03-26 00:02:02 +0000
+++ b/cygnal/crc.cpp    2008-09-07 13:30:34 +0000
@@ -55,13 +55,13 @@
        return crcfile;
 }
 
-
 CRcInitFile::CRcInitFile() : _port_offset(0)
 {
 //    GNASH_REPORT_FUNCTION;
     loadFiles();
 }
 
+//Never destroy (TODO: add a destroyDefaultInstance)
 CRcInitFile::~CRcInitFile()
 {
 //    GNASH_REPORT_FUNCTION;    

=== modified file 'cygnal/testsuite/cygnal.all/Makefile.am'
--- a/cygnal/testsuite/cygnal.all/Makefile.am   2008-09-07 12:22:58 +0000
+++ b/cygnal/testsuite/cygnal.all/Makefile.am   2008-09-07 13:30:34 +0000
@@ -20,12 +20,20 @@
 
 AUTOMAKE_OPTIONS = dejagnu
 
+noinst_LTLIBRARIES = libcygnal.la
+libcygnal_la_SOURCES = \
+       $(top_builddir)/cygnal/crc.cpp
+
+libcygnal_la_LDFLAGS = \
+       $(top_builddir)/libamf/libgnashamf.la
+
 AM_CPPFLAGS = # -Wall
 
 AM_LDFLAGS = \
        $(top_builddir)/libbase/libgnashbase.la \
        $(top_builddir)/libamf/libgnashamf.la \
        $(top_builddir)/libnet/libgnashnet.la \
+       libcygnal.la \
        $(BOOST_LIBS) \
        $(PTHREAD_LIBS)
 
@@ -38,9 +46,9 @@
         -I$(top_srcdir)/cygnal \
         -I$(top_srcdir)/libcore \
         -DLOCALEDIR=\"$(localedir)\" \
-       $(BOOST_CFLAGS) \
-       $(DEJAGNU_CFLAGS) \
-       $(PTHREAD_CFLAGS)
+               $(BOOST_CFLAGS) \
+               $(DEJAGNU_CFLAGS) \
+               $(PTHREAD_CFLAGS)
 
 check_PROGRAMS = \
        test_crc