[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 trunk
authormelunko
Mon Apr 23 19:16:24 2007 +0100 (2007-04-23)
branchtrunk
changeset 587747b409e4f01
parent 586 bd0ad44171e7
child 588 3219eb5401c0
[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
gmyth/samples/Makefile.am
gmyth/samples/gmyth_cat.c
gmyth/src/gmyth_monitor_handler.c
gmyth/src/gmyth_util.c
     1.1 --- a/gmyth/samples/Makefile.am	Mon Apr 23 18:50:32 2007 +0100
     1.2 +++ b/gmyth/samples/Makefile.am	Mon Apr 23 19:16:24 2007 +0100
     1.3 @@ -6,7 +6,7 @@
     1.4  LDADD = \
     1.5          $(top_builddir)/src/.libs/libgmyth.la
     1.6  
     1.7 -LDFLAGS = \
     1.8 +AM_LDFLAGS = \
     1.9          @GLIB_LIBS@ @GOBJECT_LIBS@ @GTHREAD_LIBS@ @LIBCURL_LIBS@
    1.10  
    1.11  INCLUDES = \
     2.1 --- a/gmyth/samples/gmyth_cat.c	Mon Apr 23 18:50:32 2007 +0100
     2.2 +++ b/gmyth/samples/gmyth_cat.c	Mon Apr 23 19:16:24 2007 +0100
     2.3 @@ -1,8 +1,15 @@
     2.4 +
     2.5 +#ifdef HAVE_CONFIG_H
     2.6 +#include "config.h"
     2.7 +#endif
     2.8  
     2.9  #include <stdio.h>
    2.10  #include <glib.h> 
    2.11  
    2.12 -#include <gmyth.h>
    2.13 +#include "gmyth_backendinfo.h"
    2.14 +#include "gmyth_file_transfer.h"
    2.15 +#include "gmyth_util.h"
    2.16 +#include "gmyth_common.h"
    2.17  
    2.18  static gboolean
    2.19  _parse_args (int argc, char *argv[], GMythBackendInfo *b_info, char** filename)
     3.1 --- a/gmyth/src/gmyth_monitor_handler.c	Mon Apr 23 18:50:32 2007 +0100
     3.2 +++ b/gmyth/src/gmyth_monitor_handler.c	Mon Apr 23 19:16:24 2007 +0100
     3.3 @@ -48,8 +48,7 @@
     3.4  #include "gmyth_marshal.h"
     3.5  
     3.6  #include "gmyth_monitor_handler.h"
     3.7 -
     3.8 -#include "gmyth.h"
     3.9 +#include "gmyth_debug.h"
    3.10   
    3.11  #define GMYTHTV_QUERY_HEADER		"QUERY_FILETRANSFER "
    3.12  
     4.1 --- a/gmyth/src/gmyth_util.c	Mon Apr 23 18:50:32 2007 +0100
     4.2 +++ b/gmyth/src/gmyth_util.c	Mon Apr 23 19:16:24 2007 +0100
     4.3 @@ -41,7 +41,11 @@
     4.4  #include <sys/time.h>
     4.5  #include <sys/timex.h>
     4.6  
     4.7 -#include "gmyth.h"
     4.8 +#include "gmyth_socket.h"
     4.9 +#include "gmyth_recorder.h"
    4.10 +#include "gmyth_backendinfo.h"
    4.11 +#include "gmyth_common.h"
    4.12 +#include "gmyth_debug.h"
    4.13  
    4.14  #if !GLIB_CHECK_VERSION (2, 10, 0)
    4.15  gchar *