search for: gtk_cflags

...wfdec/js -DXP_UNIX -DDEBUG - libswfdec_gtk_ at SWFDEC_MAJORMINOR@_la_SOURCES = \ swfdec_playback.c \ swfdec_source.c \ @@ -23,9 +21,9 @@ noinst_HEADERS = \ swfdec_source.h libswfdec_gtk_ at SWFDEC_MAJORMINOR@_la_CFLAGS = \ - -I$(top_srcdir) $(js_cflags) $(GLOBAL_CFLAGS) $(SWFDEC_CFLAGS) $(GTK_CFLAGS) \ + -I$(top_srcdir) $(GLOBAL_CFLAGS) $(SWFDEC_CFLAGS) $(GTK_CFLAGS) \ $(AUDIO_CFLAGS) $(HTTP_CFLAGS) \ - -DG_LOG_DOMAIN=\"Swfdec-Gtk\" -DXP_UNIX + -DG_LOG_DOMAIN=\"Swfdec-Gtk\" libswfdec_gtk_ at SWFDEC_MAJORMINOR@_la_LDFLAGS = \ -version-info $(SWFDEC_LIBVERSION) \ -expo...

...) -if test "x$GTK_LIBS" = "x" && \ - ( test "x$with_gtk" = "x3" || test "x$with_gtk" = "xcheck" ) ; then +if test "x$with_gtk" = "x3"; then PKG_CHECK_MODULES([GTK], [gtk+-3.0], [ - AC_SUBST([GTK_CFLAGS]) - AC_SUBST([GTK_LIBS]) GTK_VERSION=3 - AC_SUBST([GTK_VERSION]) - ], []) -fi -if test "x$GTK_LIBS" = "x" && \ - ( test "x$with_gtk" = "x2" || test "x$with_gtk" = "xcheck" ) ; then + ]) +elif tes...

...58a7f3d63a435a6b 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 -swfd...

...YPE).c swfdec_playback.c + +BUILT_SOURCES = swfdec_playback.c +CLEANFILES = swfdec_playback.c + noinst_LTLIBRARIES = libswfdecui.la noinst_PROGRAMS = swfplay swfdebug @@ -31,15 +39,17 @@ noinst_HEADERS = \ swfdec_slow_loader.h \ swfdec_widget.h -libswfdecui_la_CFLAGS = $(GLOBAL_CFLAGS) $(GTK_CFLAGS) $(SWF_CFLAGS) $(ALSA_CFLAGS) -libswfdecui_la_LDFLAGS = $(GTK_LIBS) $(SWF_LIBS) $(ALSA_LIBS) -swfplay_CFLAGS = $(GLOBAL_CFLAGS) $(GTK_CFLAGS) $(SWF_CFLAGS) $(ALSA_CFLAGS) -swfplay_LDFLAGS = $(GTK_LIBS) $(SWF_LIBS) $(ALSA_LIBS) +libswfdecui_la_CFLAGS = $(GLOBAL_CFLAGS) $(GTK_CFLAGS) $(SWF_CFLAGS) $(...

...r of LDFLAGS, so libtool doesn't link against installed libs diff --git a/player/Makefile.am b/player/Makefile.am index f29a0e8..2f284f7 100644 --- a/player/Makefile.am +++ b/player/Makefile.am @@ -25,10 +25,10 @@ noinst_HEADERS = \ 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_...

...tk-@SWFDEC_ libswfdec_gtk_@SWFDEC_MAJORMINOR@_la_SOURCES = \ swfdec_playback.c \ swfdec_source.c \ + swfdec_gtk_player.c \ swfdec_gtk_widget.c noinst_HEADERS = \ @@ -21,13 +22,14 @@ noinst_HEADERS = \ libswfdec_gtk_@SWFDEC_MAJORMINOR@_la_CFLAGS = \ $(GLOBAL_CFLAGS) $(SWFDEC_CFLAGS) $(GTK_CFLAGS) $(AUDIO_CFLAGS) \ - -DG_LOG_DOMAIN=\"Swfdec-Gtk\" + -DG_LOG_DOMAIN=\"Swfdec-Gtk\" -DXP_UNIX libswfdec_gtk_@SWFDEC_MAJORMINOR@_la_LDFLAGS = \ -version-info $(SWFDEC_LIBVERSION) \ -export-symbols-regex '^(swfdec_.*)' \ $(GTK_LIBS) $(SWFDEC_LIBS) $(AUDIO_LIBS) libs...

...a/p2v/Makefile.am +++ b/p2v/Makefile.am @@ -77,6 +77,7 @@ virt_p2v_SOURCES = \ config.c \ conversion.c \ gui.c \ + inhibit.c \ kernel.c \ kernel-cmdline.c \ main.c \ @@ -97,13 +98,15 @@ virt_p2v_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ $(PCRE_CFLAGS) \ $(LIBXML2_CFLAGS) \ - $(GTK_CFLAGS) + $(GTK_CFLAGS) \ + $(DBUS_CFLAGS) virt_p2v_LDADD = \ $(top_builddir)/src/libutils.la \ $(PCRE_LIBS) \ $(LIBXML2_LIBS) \ $(GTK_LIBS) \ + $(DBUS_LIBS) \ ../gnulib/lib/libgnu.la # Scripts to build the disk image, USB key, or kickstart. diff --git a/p2v/conversion.c b/p2v/conversion.c...

..._MSG_RESULT([not set, will check for installed Gtk])] +) + +if test "x$GTK_LIBS" = "x" && \ + ( test "x$with_gtk" = "x3" || test "x$with_gtk" = "xcheck" ) ; then + PKG_CHECK_MODULES([GTK], [gtk+-3.0], [ + AC_SUBST([GTK_CFLAGS]) + AC_SUBST([GTK_LIBS]) + GTK_VERSION=3 + AC_SUBST([GTK_VERSION]) + ], []) +fi +if test "x$GTK_LIBS" = "x" && \ + ( test "x$with_gtk" = "x2" || test "x$with_gtk" = "xcheck" ) ; then + PKG_CHECK_MO...

This version of the Gtk 2/3 patch gets alignment and padding mostly right. I still can't work out how to vertically align labels in the middle of a cell in a GtkGrid. The GtkTextView in the final dialog is still broken. Rich.

...s include .la files; do yours? That code is essentially the same code that is used to build the plugins in XMMS itself. For instance, here's the Makefile.am for the vorbis plugin: if HAVE_OGGVORBIS lib_LTLIBRARIES = libvorbis.la endif libdir = $(plugindir)/$(INPUT_PLUGIN_DIR) INCLUDES = @GTK_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ -I$(top_builddir)/intl libvorbis_la_LDFLAGS = -module -avoid-version libvorbis_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ libvorbis_la_SOURCES = \ vorbis.c vorbis.h \ configure.c \ http.c http.h \ fileinfo.c \ vcedit.c vcedit.h \ utf8.c -- - mdz

...b/src/Makefile.am index 24bce9c..bbfc043 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,10 +2,11 @@ plugindir = $(PLUGIN_DIR) plugin_LTLIBRARIES = libswfdecmozilla.la libswfdecmozilla_la_CFLAGS = $(GLOBAL_CFLAGS) $(MOZILLA_CFLAGS) $(SWFDEC_CFLAGS) \ - $(AUDIO_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS) + -DPLUGIN_DIR=\""$(PLUGIN_DIR)"\" + libswfdecmozilla_la_LDFLAGS = \ -module -avoid-version -export-symbols $(srcdir)/plugin.symbols \ - $(SWFDEC_LIBS) $(AUDIO_LIBS) $(CAIRO_LIBS) $(GTK_LIBS) + $(SWFDEC_LIBS) libswfdecmozilla_la_SOURCES = \ plugin.c \ diff --git a/src/p...

...it a/libswfdec-gtk/Makefile.am b/libswfdec-gtk/Makefile.am index 5aa9af5..b04b40f 100644 --- a/libswfdec-gtk/Makefile.am +++ b/libswfdec-gtk/Makefile.am @@ -22,12 +22,12 @@ noinst_HEADERS = \ libswfdec_gtk_ at SWFDEC_MAJORMINOR@_la_CFLAGS = \ -I$(top_srcdir) $(GLOBAL_CFLAGS) $(SWFDEC_CFLAGS) $(GTK_CFLAGS) \ - $(AUDIO_CFLAGS) $(HTTP_CFLAGS) \ + $(AUDIO_CFLAGS) $(HTTP_CFLAGS) $(GTHREAD_CFLAGS) \ -DG_LOG_DOMAIN=\"Swfdec-Gtk\" libswfdec_gtk_ at SWFDEC_MAJORMINOR@_la_LDFLAGS = \ -version-info $(SWFDEC_LIBVERSION) \ -export-symbols-regex '^(swfdec_.*)' \ - $(GTK_LIBS) $(SWFDEC_LI...

...YPE).c swfdec_playback.c + +BUILT_SOURCES = swfdec_playback.c +CLEANFILES = swfdec_playback.c + noinst_LTLIBRARIES = libswfdecui.la noinst_PROGRAMS = swfplay swfdebug @@ -31,15 +39,17 @@ noinst_HEADERS = \ swfdec_slow_loader.h \ swfdec_widget.h -libswfdecui_la_CFLAGS = $(GLOBAL_CFLAGS) $(GTK_CFLAGS) $(SWF_CFLAGS) $(ALSA_CFLAGS) -libswfdecui_la_LDFLAGS = $(GTK_LIBS) $(SWF_LIBS) $(ALSA_LIBS) -swfplay_CFLAGS = $(GLOBAL_CFLAGS) $(GTK_CFLAGS) $(SWF_CFLAGS) $(ALSA_CFLAGS) -swfplay_LDFLAGS = $(GTK_LIBS) $(SWF_LIBS) $(ALSA_LIBS) +libswfdecui_la_CFLAGS = $(GLOBAL_CFLAGS) $(GTK_CFLAGS) $(SWF_CFLAGS) $(...

--- Matt Zimmerman <mdz@debian.org> wrote: > The only difference in the command lines seems to be that your > xmms-config > explicitly links with -lgthread, while I suppose mine lets the > dynamic linker > pull it in. The only significant difference between the old and new > _LIBADD > lines is that @XMMS_LIBS@ is at the beginning in the new one. Now > that I think

...swfdec/libswfdec-$SWFDEC_MAJORMINOR.la $GLIB_LIBS -lz" +SWFDEC_CFLAGS="-I\$(top_srcdir) $GLIB_CFLAGS $CAIRO_CFLAGS" +SWFDEC_LIBS="\$(top_builddir)/libswfdec/libswfdec-$SWFDEC_MAJORMINOR.la $GLIB_LIBS $CAIRO_LIBS -lz" AC_SUBST(SWFDEC_LIBS) AC_SUBST(SWFDEC_CFLAGS) -SWFDEC_GTK_CFLAGS="$SWFDEC_CFLAGS" -SWFDEC_GTK_LIBS="\$(top_builddir)/libswfdec-gtk/libswfdec-gtk-$SWFDEC_MAJORMINOR.la $SWFDEC_LIBS" +SWFDEC_GTK_CFLAGS="$SWFDEC_CFLAGS $GTK_CFLAGS" +SWFDEC_GTK_LIBS="\$(top_builddir)/libswfdec-gtk/libswfdec-gtk-$SWFDEC_MAJORMINOR.la $SWFDEC_LIBS $G...

...it a/libswfdec-gtk/Makefile.am b/libswfdec-gtk/Makefile.am index b04b40f..5aa9af5 100644 --- a/libswfdec-gtk/Makefile.am +++ b/libswfdec-gtk/Makefile.am @@ -22,12 +22,12 @@ noinst_HEADERS = \ libswfdec_gtk_ at SWFDEC_MAJORMINOR@_la_CFLAGS = \ -I$(top_srcdir) $(GLOBAL_CFLAGS) $(SWFDEC_CFLAGS) $(GTK_CFLAGS) \ - $(AUDIO_CFLAGS) $(HTTP_CFLAGS) $(GTHREAD_CFLAGS) \ + $(AUDIO_CFLAGS) $(HTTP_CFLAGS) \ -DG_LOG_DOMAIN=\"Swfdec-Gtk\" libswfdec_gtk_ at SWFDEC_MAJORMINOR@_la_LDFLAGS = \ -version-info $(SWFDEC_LIBVERSION) \ -export-symbols-regex '^(swfdec_.*)' \ - $(GTK_LIBS) $(SWFDEC_LI...

...I hope this was the last time... diff --git a/player/Makefile.am b/player/Makefile.am index d22e527..11c0b56 100644 --- a/player/Makefile.am +++ b/player/Makefile.am @@ -24,8 +24,8 @@ noinst_HEADERS = \ swfdec_player_manager.h \ swfdec_slow_loader.h -swfplay_CFLAGS = $(GLOBAL_CFLAGS) $(GTK_CFLAGS) $(SWFDEC_GTK_CFLAGS) -swfplay_LDFLAGS = $(GTK_LIBS) $(SWFDEC_GTK_LIBS) +swfplay_CFLAGS = $(GLOBAL_CFLAGS) $(GTK_CFLAGS) $(SWFDEC_GTK_CFLAGS) $(GNOMEVFS_CFLAGS) +swfplay_LDFLAGS = $(GTK_LIBS) $(SWFDEC_GTK_LIBS) $(GNOMEVFS_LIBS) swfdebug_CFLAGS = $(GLOBAL_CFLAGS) $(GTK_CFLAGS) $(SWFDEC_GTK_CFLAGS...

... and a small initial patch which makes it easier to test virt-p2v without having to start up a virtual machine. There is still a bug in Gtk 3 where the GtkTextView on the final (running) dialog ignores gtk_widget_set_size_request and so the window appears just a single pixel high. Rich.

...c \ +# swfdec_player_manager.c \ +# swfdec_debug_widget.c noinst_HEADERS = \ - swfdec_debug_movies.h \ - swfdec_debug_script.h \ - swfdec_debug_scripts.h \ - swfdec_debug_stack.h \ - swfdec_debug_widget.h \ - swfdec_player_manager.h \ swfdec_slow_loader.h swfplay_CFLAGS = $(GLOBAL_CFLAGS) $(GTK_CFLAGS) $(SWFDEC_GTK_CFLAGS) swfplay_LDFLAGS = $(SWFDEC_GTK_LIBS) $(GTK_LIBS) -swfdebug_CFLAGS = $(GLOBAL_CFLAGS) $(GTK_CFLAGS) $(SWFDEC_GTK_CFLAGS) -swfdebug_LDFLAGS = $(SWFDEC_GTK_LIBS) $(GTK_LIBS) - - diff-tree 3cd1dcc154eab81a8ff46e0ae56a24b1487fe802 (from 7c412eac2ef2b94b8419b0002ec5f253f47ba038)...

This is basically the same as what I posted earlier today. The main difference is I split out the GDK thread sychronization (removal of) changes from the other Gtk 2/3 changes, which should make it a bit easier to review. Gtk 3 is still not quite perfect. Apart from the problem with the GtkTextView noted before, there are also vertical alignment and padding problems with labels in GtkGrid