[Gnash-commit] gnash cygnal/Makefile.am cygnal/testsuite/cygna...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/01/20 17:17:20

Modified files:
        cygnal         : Makefile.am 
        cygnal/testsuite/cygnal.all: Makefile.am 
        .              : ChangeLog 

Log message:
                * cygnal/Makefile.am: Build a library of dependant files, 
instead
                of linking them directly into the executable.
                * cygnal/testsuite/cygnal.all/Makefile.am: Link the library, not
                the objects. This fixes the distcheck problem of object files
                being left over after make check.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/Makefile.am?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/testsuite/cygnal.all/Makefile.am?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5436&r2=1.5437

Patches:
Index: cygnal/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/cygnal/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- cygnal/Makefile.am  12 Dec 2007 23:56:29 -0000      1.10
+++ cygnal/Makefile.am  20 Jan 2008 17:17:19 -0000      1.11
@@ -24,6 +24,7 @@
        . \
        testsuite
 
+# we don't want these anymore
 #DIST_SUBDIRS  = ACT IO HTTP Net unit_tests 
 
 AM_CPPFLAGS = # -Wall
@@ -32,6 +33,7 @@
 ## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
 AM_LDFLAGS = \
        ../libbase/libgnashbase.la \
+       ../server/libgnashserver.la \
        ../libamf/libgnashamf.la \
        $(LIBLTDL) \
        $(GLIB_LIBS) \
@@ -54,18 +56,9 @@
        $(BOOST_CFLAGS) \
        $(PTHREAD_CFLAGS)
 
-bin_PROGRAMS = cygnal
+noinst_LTLIBRARIES = libcygnal.la
 
-cygnal_SOURCES = \
-       cygnal.cpp \
-       http.cpp \
-       alloc.cpp \
-       netstats.cpp \
-       stream.cpp \
-       statistics.cpp \
-       crc.cpp
-#      transcode.cpp
-#      flash.cpp
+libcygnal_la_LIBADD = $(AM_LDFLAGS)
 
 noinst_HEADERS = \
        http.h \
@@ -76,8 +69,19 @@
 #      transcode.h
 #      flash.h
 
-#      protocol.cpp protocol.h
-cygnal_LDADD = $(AM_LDFLAGS)
+
+libcygnal_la_SOURCES = \
+       http.cpp \
+       alloc.cpp \
+       netstats.cpp \
+       stream.cpp \
+       statistics.cpp \
+       crc.cpp
+
+bin_PROGRAMS = cygnal
+
+cygnal_SOURCES = cygnal.cpp
+cygnal_LDADD = $(AM_LDFLAGS) libcygnal.la
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:

Index: cygnal/testsuite/cygnal.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/cygnal/testsuite/cygnal.all/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cygnal/testsuite/cygnal.all/Makefile.am     18 Jan 2008 18:18:12 -0000      
1.4
+++ cygnal/testsuite/cygnal.all/Makefile.am     20 Jan 2008 17:17:19 -0000      
1.5
@@ -25,6 +25,7 @@
 AM_LDFLAGS = \
        $(top_builddir)/libbase/libgnashbase.la \
        $(top_builddir)/libamf/libgnashamf.la \
+       $(top_builddir)/cygnal/libcygnal.la \
        $(BOOST_LIBS) \
        $(PTHREAD_LIBS)
 
@@ -42,11 +43,11 @@
 
 check_PROGRAMS = test_http test_crc
 
-test_http_SOURCES = test_http.cpp $(top_srcdir)/cygnal/http.cpp
+test_http_SOURCES = test_http.cpp
 test_http_LDADD = $(AM_LDFLAGS) 
 test_http_DEPENDENCIES = site-update
 
-test_crc_SOURCES = test_crc.cpp $(top_srcdir)/cygnal/crc.cpp
+test_crc_SOURCES = test_crc.cpp
 test_crc_LDADD = $(AM_LDFLAGS) 
 test_crc_DEPENDENCIES = site-update
 

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5436
retrieving revision 1.5437
diff -u -b -r1.5436 -r1.5437
--- ChangeLog   19 Jan 2008 17:36:44 -0000      1.5436
+++ ChangeLog   20 Jan 2008 17:17:19 -0000      1.5437
@@ -1,3 +1,11 @@
+2008-01-20  Rob Savoye  <address@hidden>
+
+       * cygnal/Makefile.am: Build a library of dependant files, instead
+       of linking them directly into the executable.
+       * cygnal/testsuite/cygnal.all/Makefile.am: Link the library, not
+       the objects. This fixes the distcheck problem of object files
+       being left over after make check.
+
 2008-01-19 Benjamin Wolsey <address@hidden>
 
        * gui/gtksup.h: get rid of C crap.