Swfdec - Jul 2007 - Branch 'as' - 3 commits - doc/Makefile.am libswfdec-gtk/Makefile.am Makefile.am player/Makefile.am test/Makefile.am

Makefile.am               |   13 ++++++++++---
 doc/Makefile.am           |    5 +++++
 libswfdec-gtk/Makefile.am |    4 ----
 player/Makefile.am        |    4 ----
 test/Makefile.am          |    2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

New commits:
diff-tree 9c722f8d1a73a21b7eb2939156c75ede85265663 (from parents)
Merge: aab61502175bd018e7de1c01b8ef86b909d932a0
f1b1b9d2d998bcc19cbd915b58a7f3d63a435a6b
Author: Benjamin Otte <otte at gnome.org>
Date:   Sat Jul 7 17:46:09 2007 +0100

    Merge branch 'master' into as

diff --cc player/Makefile.am
index 2f284f7,501d547..3295db0
@@@ -25,11 -23,10 +23,9 @@@
  	swfdec_slow_loader.h
  
  swfplay_CFLAGS = $(GLOBAL_CFLAGS) $(GTK_CFLAGS) $(SWFDEC_GTK_CFLAGS)
$(GNOMEVFS_CFLAGS)
 -swfplay_LDFLAGS = $(GTK_LIBS) $(SWFDEC_GTK_LIBS) $(GNOMEVFS_LIBS)
 +swfplay_LDFLAGS = $(SWFDEC_GTK_LIBS) $(GTK_LIBS) $(GNOMEVFS_LIBS)
  
  swfdebug_CFLAGS = $(GLOBAL_CFLAGS) $(GTK_CFLAGS) $(SWFDEC_GTK_CFLAGS)
-DXP_UNIX -I$(top_builddir)/libswfdec/js
 -swfdebug_LDFLAGS = $(GTK_LIBS) $(SWFDEC_GTK_LIBS)
 -swfdebug_LDADD = $(top_builddir)/libswfdec/js/libjs.la
 +swfdebug_LDFLAGS = $(SWFDEC_GTK_LIBS) $(GTK_LIBS)
  
- endif
- 
  
diff-tree f1b1b9d2d998bcc19cbd915b58a7f3d63a435a6b (from
084d1856375ea3dd92325fe106605ac0ce3c58a8)
Author: Benjamin Otte <otte at gnome.org>
Date:   Sat Jul 7 17:45:20 2007 +0100

    fix rest of the build without gtk
    
    In particular, this should fix docs.
    It might break make dist with gtk disabled, but I don't care right now

diff --git a/Makefile.am b/Makefile.am
index 25bbed2..c90dd0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,15 @@
-SUBDIRS= \
-	libswfdec \
+if WITH_GTK
+GTK_SUBDIRS = \
 	libswfdec-gtk \
-	player \
 	doc \
+	player
+else
+GTK_SUBDIRS +endif
+
+SUBDIRS= \
+	libswfdec \
+	$(GTK_SUBDIRS) \
 	test
 
 ACLOCAL_FLAGS = -I m4
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5ce6db0..38ef71f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -110,10 +110,15 @@ IGNORE_HFILES= \
 	swfdec_video_movie.h \
 	swfdec_xml.h
 
+if WITH_GTK
 EXTRA_HFILES = \
 	../libswfdec-gtk/swfdec_gtk_loader.h \
 	../libswfdec-gtk/swfdec_gtk_player.h \
 	../libswfdec-gtk/swfdec_gtk_widget.h
+else
+EXTRA_HFILES +endif
+ 
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
diff --git a/libswfdec-gtk/Makefile.am b/libswfdec-gtk/Makefile.am
index 84a2e8e..97efc67 100644
--- a/libswfdec-gtk/Makefile.am
+++ b/libswfdec-gtk/Makefile.am
@@ -1,5 +1,3 @@
-if WITH_GTK
-
 # this workaround is needed or autotools don't generate the .deps/*.Plo
files correctly
 swfdec_playback.c: swfdec_playback_$(AUDIO_TYPE).c Makefile
 	cmp -s $(srcdir)/swfdec_playback_$(AUDIO_TYPE).c swfdec_playback.c \
@@ -38,8 +36,6 @@ libswfdec_ at SWFDEC_MAJORMINOR@include_HEA
 	swfdec_gtk_player.h \
 	swfdec_gtk_widget.h
 
-endif
-
 EXTRA_DIST = \
 	swfdec_playback_alsa.c \
 	swfdec_playback_none.c
diff --git a/player/Makefile.am b/player/Makefile.am
index 11c0b56..501d547 100644
--- a/player/Makefile.am
+++ b/player/Makefile.am
@@ -1,5 +1,3 @@
-if WITH_GTK
-
 noinst_PROGRAMS = swfplay swfdebug
 
 swfplay_SOURCES = \
@@ -31,6 +29,4 @@ swfdebug_CFLAGS = $(GLOBAL_CFLAGS) $(GTK
 swfdebug_LDFLAGS = $(GTK_LIBS) $(SWFDEC_GTK_LIBS)
 swfdebug_LDADD = $(top_builddir)/libswfdec/js/libjs.la
 
-endif
-
 
diff-tree 084d1856375ea3dd92325fe106605ac0ce3c58a8 (from
5cdaada235a5bf34316aa5faa3a3b4fc1d2b515c)
Author: Benjamin Otte <otte at gnome.org>
Date:   Sat Jul 7 17:36:47 2007 +0100

    fix test/ build with gtk enabled

diff --git a/test/Makefile.am b/test/Makefile.am
index a38faf4..a1b7a60 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = image sound trace various
 
-noinst_LTLIBRARIES = libswfedit.la
 
 if WITH_GTK
+noinst_LTLIBRARIES = libswfedit.la
 noinst_PROGRAMS = swfdec-extract dump parse swfedit swfscript
 else
 noinst_PROGRAMS = swfdec-extract dump parse