[Swfdec-commits] 2 commits - test/custom test/image test/Makefile.am test/swfdec_test_function.c test/trace

[Benjamin Otte]

 test/Makefile.am            |   14 ++++++++------
 test/custom/Makefile.am     |    2 +-
 test/image/Makefile.am      |    2 +-
 test/swfdec_test_function.c |    2 ++
 test/trace/Makefile.am      |    2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit b4288cde7f60982604c37746f270dc5dd9ae5562
Merge: 8d1fb28... 08f33b3...
Author: Benjamin Otte <otte at gnome.org>
Date:   Sat Mar 8 01:58:09 2008 +0100

    Merge branch '0.6'
    
    Conflicts:
    
    	test/Makefile.am

diff --cc test/Makefile.am
index 41fa74b,042ade1..0da14f9
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@@ -2,6 -2,18 +2,14 @@@ SUBDIRS = custom image sound trace vari
  
  noinst_PROGRAMS = swfdec-test
  
+ if WITH_GTK
+ swfdec_gtk_test_sources = \
+ 	swfdec_test_http_request.c \
+ 	swfdec_test_http_server.c
 -swfdef_gtk_test_headers = \
 -	swfdec_test_http_request.h \
 -	swfdec_test_http_server.h
+ else
+ swfdec_gtk_test_sources =
 -swfdec_gtk_test_headers =
+ endif
+ 
  swfdec_test_sources = \
  	swfdec_test.c \
  	swfdec_test_buffer.c \
commit 08f33b3c847d3cc787f071f0bbb019a9a8c299c7
Author: Doug Goldstein <cardoe at gentoo.org>
Date:   Fri Mar 7 19:00:35 2008 -0500

    fix build failures with --disable-gtk
    
    swfdec-test depends on some pieces that are only available when --enable-gtk
    is passed. This patch ensures that those elements are not available in
    swfdec-test. It also tweaks the depends for all the tests to depend on
    swfdec-test, since it's required for them.
    Signed-off-by: Doug Goldstein <cardoe at gentoo.org>

diff --git a/test/Makefile.am b/test/Makefile.am
index 5621eca..042ade1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,13 +2,24 @@ SUBDIRS = custom image sound trace various
 
 noinst_PROGRAMS = swfdec-test
 
+if WITH_GTK
+swfdec_gtk_test_sources = \
+	swfdec_test_http_request.c \
+	swfdec_test_http_server.c
+swfdef_gtk_test_headers = \
+	swfdec_test_http_request.h \
+	swfdec_test_http_server.h
+else
+swfdec_gtk_test_sources =
+swfdec_gtk_test_headers =
+endif
+
 swfdec_test_sources = \
 	swfdec_test.c \
 	swfdec_test_buffer.c \
 	swfdec_test_function.c \
 	swfdec_test_global.c \
-	swfdec_test_http_request.c \
-	swfdec_test_http_server.c \
+	$(swf_gtk_test_sources) \
 	swfdec_test_image.c \
 	swfdec_test_plugin.c \
 	swfdec_test_socket.c \
@@ -33,8 +44,7 @@ noinst_HEADERS = \
 	swfdec_test_buffer.h \
 	swfdec_test_function.h \
 	swfdec_test_function_list.h \
-	swfdec_test_http_request.h \
-	swfdec_test_http_server.h \
+	$(swfdec_gtk_test_headers) \
 	swfdec_test_image.h \
 	swfdec_test_initialize.h \
 	swfdec_test_plugin.h \
diff --git a/test/custom/Makefile.am b/test/custom/Makefile.am
index ef04f39..7c5d334 100644
--- a/test/custom/Makefile.am
+++ b/test/custom/Makefile.am
@@ -1,4 +1,4 @@
-check-local:
+check-hook: ../swfdec-test
 	for file in $(srcdir)/*.sts; do \
 	  ../swfdec-test --script $$file $(srcdir)/`basename $$file .sts`*.swf || exit $?; \
 	done
diff --git a/test/image/Makefile.am b/test/image/Makefile.am
index 59e8119..0fccee3 100644
--- a/test/image/Makefile.am
+++ b/test/image/Makefile.am
@@ -1,4 +1,4 @@
-check-local:
+check-hook: ../swfdec-test
 	../swfdec-test --script $(srcdir)/default.sts $(srcdir)/*.swf
 
 EXTRA_DIST = \
diff --git a/test/swfdec_test_function.c b/test/swfdec_test_function.c
index e29707b..aa5e8aa 100644
--- a/test/swfdec_test_function.c
+++ b/test/swfdec_test_function.c
@@ -25,8 +25,10 @@
 #include "swfdec_test_function_list.h"
 
 /* needed by the function list */
+#ifdef HAVE_GTK
 #include "swfdec_test_http_request.h"
 #include "swfdec_test_http_server.h"
+#endif
 #include "swfdec_test_buffer.h"
 #include "swfdec_test_image.h"
 #include "swfdec_test_socket.h"
diff --git a/test/swfdec_test_socket.c b/test/swfdec_test_socket.c
index 8d2adeb..030d1a9 100644
--- a/test/swfdec_test_socket.c
+++ b/test/swfdec_test_socket.c
@@ -21,8 +21,6 @@
 #include "config.h"
 #endif
 
-#include <libsoup/soup-address.h>
-
 #include "swfdec_test_socket.h"
 #include "swfdec_test_buffer.h"
 #include "swfdec_test_function.h"
diff --git a/test/swfdec_test_socket.h b/test/swfdec_test_socket.h
index f5661dd..f3a7625 100644
--- a/test/swfdec_test_socket.h
+++ b/test/swfdec_test_socket.h
@@ -23,7 +23,6 @@
 #include "swfdec_test_plugin.h"
 #include "swfdec_test_test.h"
 #include <swfdec/swfdec.h>
-#include <libsoup/soup.h>
 
 G_BEGIN_DECLS
 
diff --git a/test/swfdec_test_swfdec_socket.c b/test/swfdec_test_swfdec_socket.c
index b8aee55..832d6bb 100644
--- a/test/swfdec_test_swfdec_socket.c
+++ b/test/swfdec_test_swfdec_socket.c
@@ -22,8 +22,6 @@
 #endif
 
 #include "swfdec_test_swfdec_socket.h"
-#include <libsoup/soup.h>
-#include <libsoup/soup-address.h>
 
 /*** SwfdecTestSwfdecSocket ***/
 
diff --git a/test/trace/Makefile.am b/test/trace/Makefile.am
index 980a893..0db63fa 100644
--- a/test/trace/Makefile.am
+++ b/test/trace/Makefile.am
@@ -1,4 +1,4 @@
-check-local:
+check-hook: ../swfdec-test
 	../swfdec-test --script $(srcdir)/default.sts $(srcdir)/*.swf
 
 EXTRA_DIST = \