# HG changeset patch # User melunko # Date 1177352184 -3600 # Node ID 747b409e4f014745c9eebda2d140de7815481e70 # Parent bd0ad44171e7c0082b4cafe90974ad24cc00d9a4 [svn r593] Fixed internal reference to gmyth.h. We can not include this header in src/gmyth_* files. Also fixed gmyth_debug link error. In the current implementation we need to include gmyth_debug.h in all files using gmyth_debug(), otherwise we will get library linking error diff -r bd0ad44171e7 -r 747b409e4f01 gmyth/samples/Makefile.am --- a/gmyth/samples/Makefile.am Mon Apr 23 18:50:32 2007 +0100 +++ b/gmyth/samples/Makefile.am Mon Apr 23 19:16:24 2007 +0100 @@ -6,7 +6,7 @@ LDADD = \ $(top_builddir)/src/.libs/libgmyth.la -LDFLAGS = \ +AM_LDFLAGS = \ @GLIB_LIBS@ @GOBJECT_LIBS@ @GTHREAD_LIBS@ @LIBCURL_LIBS@ INCLUDES = \ diff -r bd0ad44171e7 -r 747b409e4f01 gmyth/samples/gmyth_cat.c --- a/gmyth/samples/gmyth_cat.c Mon Apr 23 18:50:32 2007 +0100 +++ b/gmyth/samples/gmyth_cat.c Mon Apr 23 19:16:24 2007 +0100 @@ -1,8 +1,15 @@ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include -#include +#include "gmyth_backendinfo.h" +#include "gmyth_file_transfer.h" +#include "gmyth_util.h" +#include "gmyth_common.h" static gboolean _parse_args (int argc, char *argv[], GMythBackendInfo *b_info, char** filename) diff -r bd0ad44171e7 -r 747b409e4f01 gmyth/src/gmyth_monitor_handler.c --- a/gmyth/src/gmyth_monitor_handler.c Mon Apr 23 18:50:32 2007 +0100 +++ b/gmyth/src/gmyth_monitor_handler.c Mon Apr 23 19:16:24 2007 +0100 @@ -48,8 +48,7 @@ #include "gmyth_marshal.h" #include "gmyth_monitor_handler.h" - -#include "gmyth.h" +#include "gmyth_debug.h" #define GMYTHTV_QUERY_HEADER "QUERY_FILETRANSFER " diff -r bd0ad44171e7 -r 747b409e4f01 gmyth/src/gmyth_util.c --- a/gmyth/src/gmyth_util.c Mon Apr 23 18:50:32 2007 +0100 +++ b/gmyth/src/gmyth_util.c Mon Apr 23 19:16:24 2007 +0100 @@ -41,7 +41,11 @@ #include #include -#include "gmyth.h" +#include "gmyth_socket.h" +#include "gmyth_recorder.h" +#include "gmyth_backendinfo.h" +#include "gmyth_common.h" +#include "gmyth_debug.h" #if !GLIB_CHECK_VERSION (2, 10, 0) gchar *