[Thoggen-cvs] SF.net SVN: thoggen: [246] trunk/thoggen
Status: Beta
Brought to you by:
tp-m
From: <tp...@us...> - 2006-10-11 15:43:25
|
Revision: 246 http://svn.sourceforge.net/thoggen/?rev=246&view=rev Author: tp-m Date: 2006-10-11 08:43:15 -0700 (Wed, 11 Oct 2006) Log Message: ----------- * configure.ac: * src/Makefile.am: * src/gst-plugins/Makefile.am: Make sure to add CFLAGS/LIBS for libraries from gst-plugins-base. Modified Paths: -------------- trunk/thoggen/ChangeLog trunk/thoggen/configure.ac trunk/thoggen/src/Makefile.am trunk/thoggen/src/gst-plugins/Makefile.am Modified: trunk/thoggen/ChangeLog =================================================================== --- trunk/thoggen/ChangeLog 2006-10-11 15:07:00 UTC (rev 245) +++ trunk/thoggen/ChangeLog 2006-10-11 15:43:15 UTC (rev 246) @@ -1,6 +1,13 @@ 2006-10-11 Tim-Philipp Müller <tim at centricular dot net> + * configure.ac: * src/Makefile.am: + * src/gst-plugins/Makefile.am: + Make sure to add CFLAGS/LIBS for libraries from gst-plugins-base. + +2006-10-11 Tim-Philipp Müller <tim at centricular dot net> + + * src/Makefile.am: Oops, let's not forget this one. * src/th-job-cropping-dialog.c: Modified: trunk/thoggen/configure.ac =================================================================== --- trunk/thoggen/configure.ac 2006-10-11 15:07:00 UTC (rev 245) +++ trunk/thoggen/configure.ac 2006-10-11 15:43:15 UTC (rev 246) @@ -206,7 +206,7 @@ dnl ===== Check for GStreamer plugins 0.10 ===== -PKG_CHECK_MODULES(GSTREAMER_PLUGINS, [gstreamer-plugins-base-0.10 >= $gstpluginsbase_required],, [ +PKG_CHECK_MODULES(GSTREAMER_PLUGINS_BASE, [gstreamer-plugins-base-0.10 >= $gstpluginsbase_required],, [ AC_MSG_ERROR( [ Cannot find gstreamer-plugins-base-0.10 >= $gstpluginsbase_required @@ -242,8 +242,8 @@ SAVED_CFLAGS="$CFLAGS" SAVED_CPPFLAGS="$CPPFLAGS" -CFLAGS="$GSTREAMER_PLUGINS_CFLAGS" -CPPFLAGS="$GSTREAMER_PLUGINS_CFLAGS" +CFLAGS="$GSTREAMER_PLUGINS_BASE_CFLAGS" +CPPFLAGS="$GSTREAMER_PLUGINS_BASE_CFLAGS" AC_CHECK_HEADERS([gst/video/video.h], , [ dnl --- headers not found --- @@ -252,7 +252,7 @@ Cannot find the GStreamer-0.10 plugins header gst/video/video.h. Please make sure you have the GStreamer Plugins development - package installed (probably called 'libgstreamer-plugins0.10-dev' + package installed (probably called 'libgstreamer-plugins-base0.10-dev' or 'gstreamer-plugins-devel' most likely). ], Modified: trunk/thoggen/src/Makefile.am =================================================================== --- trunk/thoggen/src/Makefile.am 2006-10-11 15:07:00 UTC (rev 245) +++ trunk/thoggen/src/Makefile.am 2006-10-11 15:43:15 UTC (rev 246) @@ -13,17 +13,18 @@ $(HAL_CFLAGS) \ $(DBUS_GLIB_CFLAGS) \ $(VALGRIND_CFLAGS) \ + $(GSTREAMER_PLUGINS_BASE_CFLAGS) \ -DDATADIR=\"$(pkgdatadir)\" \ -DLOCALEDIR=\"$(prefix)/share/locale/\" \ -DISO_639_XML_PATH=\"$(ISO_639_XML_PATH)\" \ -DISO_639_DOMAIN=\"$(ISO_639_DOMAIN)\" -# FIXME: use gstreamer-plugins-base-0.10 for interfaces thoggen_LDADD = \ $(top_builddir)/src/gst-plugins/libthoggenplugins.a \ $(GLADE_LIBS) \ $(GSTREAMER_LIBS) \ -lgstbase-0.10 \ + $(GSTREAMER_PLUGINS_BASE_LIBS) \ -lgstinterfaces-0.10 \ -lgstvideo-0.10 \ $(HAL_LIBS) \ @@ -43,8 +44,8 @@ $(GLADE_FILES) BUILT_SOURCES = \ - th-marshal.c \ - th-marshal.h + th-marshal.c \ + th-marshal.h thoggen_SOURCES = \ th-app-window.c \ @@ -93,13 +94,14 @@ th-utils.h test_title_preview_CFLAGS = \ - $(GSTREAMER_CFLAGS) \ + $(GSTREAMER_CFLAGS) \ + $(GSTREAMER_PLUGINS_BASE_CFLAGS) \ $(GLADE_CFLAGS) -# FIXME: use gstreamer-plugins-base-0.10 for interfaces test_title_preview_LDADD = \ $(top_builddir)/src/gst-plugins/libthoggenplugins.a \ $(GSTREAMER_LIBS) \ + $(GSTREAMER_PLUGINS_BASE_LIBS) \ -lgstbase-0.10 \ -lgstinterfaces-0.10 \ -lgstvideo-0.10 \ Modified: trunk/thoggen/src/gst-plugins/Makefile.am =================================================================== --- trunk/thoggen/src/gst-plugins/Makefile.am 2006-10-11 15:07:00 UTC (rev 245) +++ trunk/thoggen/src/gst-plugins/Makefile.am 2006-10-11 15:43:15 UTC (rev 246) @@ -5,7 +5,7 @@ SUBDIRS = -INCLUDES = $(GSTREAMER_PLUGINS_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)/src +INCLUDES = $(GSTREAMER_PLUGINS_BASE_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)/src EXTRA_DIST = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |