diff --git a/guile/mu-guile-log.c b/guile/mu-guile-log.c deleted file mode 100644 index 205764b1..00000000 --- a/guile/mu-guile-log.c +++ /dev/null @@ -1,31 +0,0 @@ -/* -** Copyright (C) 2011 Dirk-Jan C. Binnema -** -** This program is free software; you can redistribute it and/or modify it -** under the terms of the GNU General Public License as published by the -** Free Software Foundation; either version 3, or (at your option) any -** later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software Foundation, -** Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -** -*/ - -#include "mu-guile-util.h" -#include "mu-guile-log.h" - - - -void* -mu_guile_log_init (void *data) -{ -#include "mu-guile-log.x" - - return NULL; -} diff --git a/guile/mu-guile-log.h b/guile/mu-guile-log.h deleted file mode 100644 index e3bd3709..00000000 --- a/guile/mu-guile-log.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -** Copyright (C) 2011 Dirk-Jan C. Binnema -** -** This program is free software; you can redistribute it and/or modify it -** under the terms of the GNU General Public License as published by the -** Free Software Foundation; either version 3, or (at your option) any -** later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software Foundation, -** Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -** -*/ - -#ifndef __MU_GUILE_LOG_H__ -#define __MU_GUILE_LOG_H__ - - -#ifdef __cplusplus -extern "C" { -#endif /*__cplusplus*/ - -/** - * initialize mu logging functions - * - */ -void *mu_guile_log_init (void *data); - - -#ifdef __cplusplus -} -#endif /*__cplusplus*/ - -#endif /*__MU_GUILE_LOG_H__*/ diff --git a/guile/mu.scm b/guile/mu.scm index 41935408..2e51564b 100644 --- a/guile/mu.scm +++ b/guile/mu.scm @@ -18,7 +18,6 @@ (define-module (mu) :use-module (oop goops) - :use-module (mu log) :use-module (mu msg) :use-module (mu contact) :export diff --git a/guile/mu/Makefile.am b/guile/mu/Makefile.am index c5a276ee..f3c45bc9 100644 --- a/guile/mu/Makefile.am +++ b/guile/mu/Makefile.am @@ -18,7 +18,7 @@ include $(top_srcdir)/gtest.mk # FIXME: GUILE_SITEDIR would be better, but that # breaks 'make distcheck' -scmdir=${prefix}/share/guile/site/2.0/ +scmdir=${prefix}/share/guile/site/2.0/mu/ scm_DATA= \ msg.scm \ contact.scm diff --git a/guile/mu/msg.scm b/guile/mu/msg.scm index 87abda40..f95dbdda 100644 --- a/guile/mu/msg.scm +++ b/guile/mu/msg.scm @@ -16,7 +16,5 @@ ;; along with this program; if not, write to the Free Software Foundation, ;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -(define-module (mu msg) - :use-module (mu log)) - +(define-module (mu msg)) (load-extension "libguile-mu" "mu_guile_msg_init")