[Gnash-commit] /srv/bzr/gnash/trunk r11354: only build generate_amfbins at check time. Fix minor tab/space issues.

[rob]

------------------------------------------------------------
revno: 11354
committer: address@hidden
branch nick: trunk
timestamp: Fri 2009-07-31 08:19:05 -0600
message:
  only build generate_amfbins at check time. Fix minor tab/space issues.
modified:
  testsuite/libmedia.all/Makefile.am
  testsuite/libnet.all/Makefile.am

=== modified file 'testsuite/libmedia.all/Makefile.am'
--- a/testsuite/libmedia.all/Makefile.am        2009-07-22 16:56:41 +0000
+++ b/testsuite/libmedia.all/Makefile.am        2009-07-31 14:19:05 +0000
@@ -25,12 +25,12 @@
 AM_LDFLAGS = \
        $(top_builddir)/libbase/libgnashbase.la \
        $(top_builddir)/libmedia/libgnashmedia.la \
+       $(GSTREAMER_PLUGINS_BASE_LIBS) \
+       $(GSTREAMER_APP_LIBS) \
+       $(GSTREAMER_LIBS) \
        $(BOOST_LIBS) \
-       $(DEJAGNU_CFLAGS) \
        $(PTHREAD_LIBS) \
-    $(GSTREAMER_LIBS) -lgstbase-0.10 \
-       $(GSTAPP_LIBS) \
-       $(GSTINTERFACES_LIBS) 
+       $(NULL)
 
 localedir = $(datadir)/locale
 
@@ -39,8 +39,8 @@
         -I$(top_srcdir)/libnet \
         -I$(top_srcdir)/libamf \
         -I$(top_srcdir)/libbase \
-               -I$(top_srcdir)/libmedia \
-               -I$(top_srcdir)/libmedia/gst \
+       -I$(top_srcdir)/libmedia \
+       -I$(top_srcdir)/libmedia/gst \
         -I$(top_srcdir)/cygnal \
         -I$(top_srcdir)/libcore \
         -DLOCALEDIR=\"$(localedir)\" \
@@ -62,7 +62,7 @@
  test_videoinput_SOURCES = test_videoinput.cpp
  test_videoinput_LDADD = $(AM_LDFLAGS) 
  test_videoinput_DEPENDENCIES = site-update
- 
+
  test_audioinput_SOURCES = test_audioinput.cpp
  test_audioinput_LDADD = $(AM_LDFLAGS)
  test_audioinput_DEPENDENCIES = site-update

=== modified file 'testsuite/libnet.all/Makefile.am'
--- a/testsuite/libnet.all/Makefile.am  2009-02-25 22:33:03 +0000
+++ b/testsuite/libnet.all/Makefile.am  2009-07-31 14:19:05 +0000
@@ -44,10 +44,7 @@
        $(DEJAGNU_CFLAGS) \
        $(PTHREAD_CFLAGS)
 
-# this is a utility program used to generate binary AMF files for testing 
protocols.
-noinst_PROGRAMS = generate_amfbins
-
-check_PROGRAMS = \
+test_progs = \
        test_cque \
        test_http \
        test_diskstream \
@@ -55,6 +52,9 @@
        test_rtmp 
 #      test_handler
 
+# this is a utility program used to generate binary AMF files for testing 
protocols.
+check_PROGRAMS = generate_amfbins $(test_progs)
+
 generate_amfbins_SOURCES = generate_amfbins.cpp
 generate_amfbins_LDADD = $(AM_LDFLAGS) 
 generate_amfbins_DEPENDENCIES = site-update
@@ -94,6 +94,7 @@
        site.exp.bak \
        testrun.* \
        fooBar* \
+       generate_amfbins \
        *.bin
 
 check-DEJAGNU: site-update
@@ -102,7 +103,7 @@
          $$runtest $(RUNTESTFLAGS) $(TEST_DRIVERS); true; \
        else \
          echo "WARNING: could not find \`runtest'" 1>&2; \
-         for i in "$(check_PROGRAMS)"; do \
+         for i in " $(test_progs)"; do \
            $(SHELL) $$i; \
          done; \
        fi