r1468@localhost: muntyan | 2005-12-22 01:00:19 -0600

Moved mooutils-python.* into moopython/, made it pass distcheck

moo/moopython/Makefile.incl

@@ -8,6 +8,8 @@ moopython_srcdir = $(srcdir)/$(moopython)
 moopython_sources =                             \
     $(moopython)/moopython.c                    \
     $(moopython)/moopython.h                    \
+    $(moopython)/moopython-utils.c              \
+    $(moopython)/moopython-utils.h              \
     $(moopython)/mooplugin-python.c             \
     $(moopython)/mooplugin-python.h
 

moo/moopython/mooplugin-python.c

@@ -21,8 +21,8 @@
 #endif
 
 #include "moopython/mooplugin-python.h"
+#include "moopython/moopython-utils.h"
 #include "mooedit/mooplugin-macro.h"
-#include "mooutils/mooutils-python.h"
 
 #define PLUGIN_SUFFIX ".py"
 

moo/moopython/moopython-utils.c

@@ -1,5 +1,5 @@
 /*
- *   mooutils/mooutils-python.c
+ *   moopython/moopython-utils.c
  *
  *   Copyright (C) 2004-2005 by Yevgen Muntyan <muntyan@math.tamu.edu>
  *
@@ -15,7 +15,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include "mooutils/mooutils-python.h"
+#include "moopython/moopython-utils.h"
 #include "mooutils/moocompat.h"
 #ifdef MOO_USE_PYGTK
 # define NO_IMPORT_PYGOBJECT

moo/moopython/moopython-utils.h

@@ -1,5 +1,5 @@
 /*
- *   mooutils/mooutils-python.h
+ *   moopython/moopython-utils.h
  *
  *   Copyright (C) 2004-2005 by Yevgen Muntyan <muntyan@math.tamu.edu>
  *
@@ -11,8 +11,8 @@
  *   See COPYING file that comes with this distribution.
  */
 
-#ifndef MOOUTILS_MOOUTILS_PYTHON_H
+#ifndef __MOO_PYTHON_UTILS_H__
-#define MOOUTILS_MOOUTILS_PYTHON_H
+#define __MOO_PYTHON_UTILS_H__
 
 #include <Python.h>
 #include <glib-object.h>
@@ -71,4 +71,4 @@ G_STMT_START {                  \
 
 G_END_DECLS
 
-#endif /* MOOUTILS_MOOUTILS_PYTHON_H */
+#endif /* __MOO_PYTHON_UTILS_H__ */

moo/moopython/pygtk/moo-pygtk.c

@@ -17,7 +17,7 @@
 #include "config.h"
 #endif
 
-#include "moopython/moo-mod.h"
+#include "moopython/pygtk/moo-mod.h"
 #include "moopython/pygtk/moo-pygtk.h"
 #include <pygobject.h>  /* _PyGObjectAPI lives here */
 #include <pygtk/pygtk.h>

moo/moopython/pygtk/mooedit-pygtk.override

@@ -11,7 +11,7 @@ headers
 #include "mooedit/mootextiter.h"
 #include "mooedit/mooeditprefs.h"
 #include "moopython/mooplugin-python.h"
-#include "mooutils/mooutils-python.h"
+#include "moopython/moopython-utils.h"
 #include "moopython/pygtk/moo-pygtk.h"
 
 

moo/moopython/pygtk/mooterm-pygtk.override

@@ -10,7 +10,7 @@ headers
 #include "mooterm/mooterm-text.h"
 #include "mooterm/mootermbuffer.h"
 #include "mooterm/mooterm-prefs.h"
-#include "mooutils/mooutils-python.h"
+#include "moopython/moopython-utils.h"
 #include "moopython/pygtk/moo-pygtk.h"
 
 

moo/moopython/pygtk/mooutils-mod.c

@@ -17,8 +17,8 @@
 #include <glib.h>
 #include "moopython/pygtk/moo-pygtk.h"
 #include "moopython/pygtk/mooutils-mod.h"
+#include "moopython/moopython-utils.h"
 #include "mooutils/moostock.h"
-#include "mooutils/mooutils-python.h"
 
 
 static char *moo_utils_module_doc = (char*)"_moo_utils module.";

moo/moopython/pygtk/mooutils-pygtk.override

@@ -22,7 +22,7 @@ headers
 #include "mooutils/moostock.h"
 #include "mooutils/moouixml.h"
 #include "mooutils/moomenuaction.h"
-#include "mooutils/mooutils-python.h"
+#include "moopython/moopython-utils.h"
 #include "moopython/pygtk/moo-pygtk.h"
 
 

moo/mooutils/Makefile.incl

@@ -36,7 +36,6 @@ mooutils_include_headers =                     \
     $(mooutils)/mooundomanager.h               \
     $(mooutils)/mooutils-gobject.h             \
     $(mooutils)/mooutils-misc.h                \
-    $(mooutils)/mooutils-python.h              \
     $(mooutils)/moowindow.h
 
 mooutils_sources =                             \
@@ -87,23 +86,14 @@ mooutils_sources =                             \
     $(mooutils)/stock-select-all-24.h          \
     $(mooutils)/stock-terminal-24.h
 
-mooutils_python_sources =                      \
-    $(mooutils)/mooutils-python.c              \
-    $(mooutils)/mooutils-python.h
-
 mooutils_unix_sources =                        \
     $(mooutils)/moocmd.c
 
-if MOO_USE_PYTHON
-mooutils_sources += $(mooutils_python_sources)
-endif
-
 nodist_mooutils_sources =                      \
     $(mooutils)/moomarshals.c                  \
     $(mooutils)/moomarshals.h
 
 mooutils_extra_dist =                          \
-    $(mooutils_python_sources)                 \
     $(mooutils)/moomarshals.list               \
     $(mooutils)/py2h.sh                        \
     $(mooutils)/xml2h.sh