diff --git a/moo/medit-app/main.c b/moo/medit-app/main.c index 1640a6ba..4e7a6e5c 100644 --- a/moo/medit-app/main.c +++ b/moo/medit-app/main.c @@ -20,7 +20,7 @@ #include "mooutils/mooutils-fs.h" #include "mooutils/mooutils-misc.h" #include "mooutils/mootype-macros.h" -#include "plugins/mooeditplugins.h" +#include "plugins/mooplugin-builtin.h" #include #include #include diff --git a/moo/plugins/Makefile.incl b/moo/plugins/Makefile.incl index 8d40a3e5..e653319d 100644 --- a/moo/plugins/Makefile.incl +++ b/moo/plugins/Makefile.incl @@ -1,11 +1,9 @@ -AM_CPPFLAGS += -I$(srcdir)/plugins - plugins_sources += \ plugins/moofileselector-prefs.c \ plugins/moofileselector.c \ plugins/moofileselector.h \ - plugins/mooeditplugins.h \ - plugins/mooeditplugins.c \ + plugins/mooplugin-builtin.h \ + plugins/mooplugin-builtin.c \ plugins/moofilelist.c \ plugins/moofind.c \ plugins/mooluaplugin.cpp diff --git a/moo/plugins/ctags/ctags-plugin.c b/moo/plugins/ctags/ctags-plugin.c index 591a6e55..ba8e4973 100644 --- a/moo/plugins/ctags/ctags-plugin.c +++ b/moo/plugins/ctags/ctags-plugin.c @@ -16,7 +16,7 @@ #include "config.h" #include "mooedit/mooplugin-macro.h" -#include "mooeditplugins.h" +#include "plugins/mooplugin-builtin.h" #include "mooedit/mooeditwindow.h" #include "mooedit/mooeditview.h" #include "mooutils/mooi18n.h" diff --git a/moo/plugins/ctags/ctags-view.c b/moo/plugins/ctags/ctags-view.c index 0bff2af9..28c0306d 100644 --- a/moo/plugins/ctags/ctags-view.c +++ b/moo/plugins/ctags/ctags-view.c @@ -16,7 +16,7 @@ #include "ctags-view.h" #include "ctags-doc.h" -#include "mooeditplugins.h" +#include "plugins/mooplugin-builtin.h" #include "marshals.h" #include #include diff --git a/moo/plugins/moofilelist.c b/moo/plugins/moofilelist.c index d5fba619..48986202 100644 --- a/moo/plugins/moofilelist.c +++ b/moo/plugins/moofilelist.c @@ -14,7 +14,7 @@ */ #include "config.h" -#include "mooeditplugins.h" +#include "plugins/mooplugin-builtin.h" #include "mooedit/mooplugin-macro.h" #include "mooutils/mooi18n.h" #include "mooutils/mootype-macros.h" diff --git a/moo/plugins/moofileselector.c b/moo/plugins/moofileselector.c index cf81eb9f..906af1d4 100644 --- a/moo/plugins/moofileselector.c +++ b/moo/plugins/moofileselector.c @@ -22,7 +22,7 @@ #include "mooedit/mooeditwindow.h" #include "moofileview/moobookmarkmgr.h" #include "moofileview/moofileview-tools.h" -#include "mooeditplugins.h" +#include "plugins/mooplugin-builtin.h" #include "marshals.h" #include "mooutils/moostock.h" #include "mooutils/mooprefs.h" diff --git a/moo/plugins/moofind.c b/moo/plugins/moofind.c index b9fb5a02..397c79ef 100644 --- a/moo/plugins/moofind.c +++ b/moo/plugins/moofind.c @@ -18,7 +18,7 @@ #endif #include "mooedit/mooplugin-macro.h" -#include "mooeditplugins.h" +#include "plugins/mooplugin-builtin.h" #include "moofileview/moofileentry.h" #include "moocmdview.h" #include "mooedit/mooedit-accels.h" diff --git a/moo/plugins/mooluaplugin.cpp b/moo/plugins/mooluaplugin.cpp index ba071510..8dc546c6 100644 --- a/moo/plugins/mooluaplugin.cpp +++ b/moo/plugins/mooluaplugin.cpp @@ -14,7 +14,7 @@ */ #include "config.h" -#include "mooeditplugins.h" +#include "plugins/mooplugin-builtin.h" #include "mooedit/mooplugin-macro.h" #include "mooedit/mooplugin-loader.h" #include "mooutils/mooi18n.h" diff --git a/moo/plugins/mooeditplugins.c b/moo/plugins/mooplugin-builtin.c similarity index 94% rename from moo/plugins/mooeditplugins.c rename to moo/plugins/mooplugin-builtin.c index 497548a5..408ee89c 100644 --- a/moo/plugins/mooeditplugins.c +++ b/moo/plugins/mooplugin-builtin.c @@ -1,5 +1,5 @@ /* - * mooeditplugins.c + * mooplugin-builtin.c * * Copyright (C) 2004-2010 by Yevgen Muntyan * @@ -14,7 +14,7 @@ */ #include -#include "mooeditplugins.h" +#include "plugins/mooplugin-builtin.h" #include "mooutils/mooutils-misc.h" #ifdef MOO_ENABLE_PYTHON diff --git a/moo/plugins/mooeditplugins.h b/moo/plugins/mooplugin-builtin.h similarity index 98% rename from moo/plugins/mooeditplugins.h rename to moo/plugins/mooplugin-builtin.h index 01f61b19..1a61b468 100644 --- a/moo/plugins/mooeditplugins.h +++ b/moo/plugins/mooplugin-builtin.h @@ -1,5 +1,5 @@ /* - * mooeditplugins.h + * mooplugin-builtin.h * * Copyright (C) 2004-2010 by Yevgen Muntyan * diff --git a/moo/plugins/old/moopythonplugin.c b/moo/plugins/old/moopythonplugin.c index 9fef4a77..b4372533 100644 --- a/moo/plugins/old/moopythonplugin.c +++ b/moo/plugins/old/moopythonplugin.c @@ -14,7 +14,7 @@ */ #include "config.h" -#include "mooeditplugins.h" +#include "plugins/mooplugin-builtin.h" #include "mooedit/mooplugin-macro.h" #include "mooedit/mooplugin-loader.h" #include "mooutils/mooi18n.h" diff --git a/moo/plugins/usertools/exe/moocommand-exe.h b/moo/plugins/usertools/exe/moocommand-exe.h index 703e0b4c..bd7ba7fc 100644 --- a/moo/plugins/usertools/exe/moocommand-exe.h +++ b/moo/plugins/usertools/exe/moocommand-exe.h @@ -16,7 +16,7 @@ #ifndef MOO_COMMAND_EXE_H #define MOO_COMMAND_EXE_H -#include "usertools/moocommand.h" +#include "plugins/usertools/moocommand.h" #include G_BEGIN_DECLS diff --git a/moo/plugins/usertools/lua/moocommand-lua.h b/moo/plugins/usertools/lua/moocommand-lua.h index 71a51129..19b8df5b 100644 --- a/moo/plugins/usertools/lua/moocommand-lua.h +++ b/moo/plugins/usertools/lua/moocommand-lua.h @@ -16,7 +16,7 @@ #ifndef MOO_COMMAND_LUA_H #define MOO_COMMAND_LUA_H -#include "usertools/moocommand.h" +#include "plugins/usertools/moocommand.h" G_BEGIN_DECLS diff --git a/moo/plugins/usertools/moocommand.h b/moo/plugins/usertools/moocommand.h index 759a0e93..691f358e 100644 --- a/moo/plugins/usertools/moocommand.h +++ b/moo/plugins/usertools/moocommand.h @@ -20,7 +20,7 @@ #include "mooedit/mooedit.h" #include "mooedit/mooeditwindow.h" #include "moooutputfilter.h" -#include "usertools/moousertools-enums.h" +#include "moousertools-enums.h" G_BEGIN_DECLS diff --git a/moo/plugins/usertools/moousertools.c b/moo/plugins/usertools/moousertools.c index 6544399f..fbc5284b 100644 --- a/moo/plugins/usertools/moousertools.c +++ b/moo/plugins/usertools/moousertools.c @@ -17,7 +17,7 @@ #include "moousertools.h" #include "moousertools-prefs.h" #include "moocommand-private.h" -#include "mooeditplugins.h" +#include "plugins/mooplugin-builtin.h" #include "mooedit/mooeditor.h" #include "mooedit/mooeditaction.h" #include "mooedit/mooeditaction-factory.h"