[gnome-builder/wip/chergert/pipeline-merge: 61/78] buildconfig: move buildconfig into separate buildconfig plugin

[Matthew Leeds <mwleeds src gnome org>]

commit 31f8ee0c77168bc706a750476bc078f12c502520
Author: Christian Hergert <chergert redhat com>
Date:   Sat Feb 4 11:37:22 2017 -0800

    buildconfig: move buildconfig into separate buildconfig plugin
    
    This is more aptly named buildconfig so we will separate it from the
    buildsystem module.

 libide/Makefile.am                                 |   10 +++++-----
 .../ide-buildconfig-configuration-provider.c       |    4 ++--
 .../ide-buildconfig-configuration-provider.h       |    0
 .../ide-buildconfig-configuration.c                |    4 ++--
 .../ide-buildconfig-configuration.h                |    0
 .../ide-buildconfig-plugin.c}                      |    2 +-
 libide/ide.h                                       |    4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/libide/Makefile.am b/libide/Makefile.am
index 4d24c57..94dc101 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -30,6 +30,8 @@ libide_1_0_la_public_headers =                            \
        buffers/ide-buffer.h                              \
        buffers/ide-unsaved-file.h                        \
        buffers/ide-unsaved-files.h                       \
+       buildconfig/ide-buildconfig-configuration.h       \
+       buildconfig/ide-buildconfig-configuration-provider.h \
        buildsystem/ide-build-log.h                       \
        buildsystem/ide-build-manager.h                   \
        buildsystem/ide-build-pipeline.h                  \
@@ -40,8 +42,6 @@ libide_1_0_la_public_headers =                            \
        buildsystem/ide-build-stage-transfer.h            \
        buildsystem/ide-build-system.h                    \
        buildsystem/ide-build-target.h                    \
-       buildsystem/ide-buildconfig-configuration.h       \
-       buildsystem/ide-buildconfig-configuration-provider.h \
        buildsystem/ide-configuration-manager.h           \
        buildsystem/ide-configuration.h                   \
        buildsystem/ide-configuration-provider.h          \
@@ -203,6 +203,8 @@ libide_1_0_la_public_sources =                            \
        buffers/ide-buffer.c                              \
        buffers/ide-unsaved-file.c                        \
        buffers/ide-unsaved-files.c                       \
+       buildconfig/ide-buildconfig-configuration.c       \
+       buildconfig/ide-buildconfig-configuration-provider.c \
        buildsystem/ide-build-manager.c                   \
        buildsystem/ide-build-pipeline.c                  \
        buildsystem/ide-build-pipeline-addin.c            \
@@ -212,8 +214,6 @@ libide_1_0_la_public_sources =                            \
        buildsystem/ide-build-stage-transfer.c            \
        buildsystem/ide-build-system.c                    \
        buildsystem/ide-build-target.c                    \
-       buildsystem/ide-buildconfig-configuration.c       \
-       buildsystem/ide-buildconfig-configuration-provider.c \
        buildsystem/ide-configuration-manager.c           \
        buildsystem/ide-configuration.c                   \
        buildsystem/ide-configuration-provider.c          \
@@ -379,10 +379,10 @@ libide_1_0_la_SOURCES =                                   \
        application/ide-application-private.h             \
        application/ide-application-tests.c               \
        application/ide-application-tests.h               \
+       buildconfig/ide-buildconfig-plugin.c              \
        buildsystem/ide-build-log.c                       \
        buildsystem/ide-build-log-private.h               \
        buildsystem/ide-build-stage-private.h             \
-       buildsystem/ide-buildsystem-plugin.c              \
        buildui/ide-build-configuration-row.c             \
        buildui/ide-build-configuration-row.h             \
        buildui/ide-build-configuration-view.c            \
diff --git a/libide/buildsystem/ide-buildconfig-configuration-provider.c 
b/libide/buildconfig/ide-buildconfig-configuration-provider.c
similarity index 99%
rename from libide/buildsystem/ide-buildconfig-configuration-provider.c
rename to libide/buildconfig/ide-buildconfig-configuration-provider.c
index b8bab0b..b2a20b9 100644
--- a/libide/buildsystem/ide-buildconfig-configuration-provider.c
+++ b/libide/buildconfig/ide-buildconfig-configuration-provider.c
@@ -25,8 +25,8 @@
 #include "ide-internal.h"
 #include "ide-macros.h"
 
-#include "buildsystem/ide-buildconfig-configuration.h"
-#include "buildsystem/ide-buildconfig-configuration-provider.h"
+#include "buildconfig/ide-buildconfig-configuration.h"
+#include "buildconfig/ide-buildconfig-configuration-provider.h"
 #include "buildsystem/ide-configuration-manager.h"
 #include "buildsystem/ide-configuration-provider.h"
 #include "buildsystem/ide-configuration.h"
diff --git a/libide/buildsystem/ide-buildconfig-configuration-provider.h 
b/libide/buildconfig/ide-buildconfig-configuration-provider.h
similarity index 100%
rename from libide/buildsystem/ide-buildconfig-configuration-provider.h
rename to libide/buildconfig/ide-buildconfig-configuration-provider.h
diff --git a/libide/buildsystem/ide-buildconfig-configuration.c 
b/libide/buildconfig/ide-buildconfig-configuration.c
similarity index 97%
rename from libide/buildsystem/ide-buildconfig-configuration.c
rename to libide/buildconfig/ide-buildconfig-configuration.c
index 40b5a57..ff17fc8 100644
--- a/libide/buildsystem/ide-buildconfig-configuration.c
+++ b/libide/buildconfig/ide-buildconfig-configuration.c
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <glib/gi18n.h>
+#define G_LOG_DOMAIN "ide-buildconfig-configuration"
 
-#include "buildsystem/ide-buildconfig-configuration.h"
+#include "buildconfig/ide-buildconfig-configuration.h"
 
 struct _IdeBuildconfigConfiguration
 {
diff --git a/libide/buildsystem/ide-buildconfig-configuration.h 
b/libide/buildconfig/ide-buildconfig-configuration.h
similarity index 100%
rename from libide/buildsystem/ide-buildconfig-configuration.h
rename to libide/buildconfig/ide-buildconfig-configuration.h
diff --git a/libide/buildsystem/ide-buildsystem-plugin.c b/libide/buildconfig/ide-buildconfig-plugin.c
similarity index 94%
rename from libide/buildsystem/ide-buildsystem-plugin.c
rename to libide/buildconfig/ide-buildconfig-plugin.c
index e4ed22e..901bacb 100644
--- a/libide/buildsystem/ide-buildsystem-plugin.c
+++ b/libide/buildconfig/ide-buildconfig-plugin.c
@@ -20,8 +20,8 @@
 
 #include <libpeas/peas.h>
 
+#include "buildconfig/ide-buildconfig-configuration-provider.h"
 #include "buildsystem/ide-configuration-provider.h"
-#include "buildsystem/ide-buildconfig-configuration-provider.h"
 
 void
 ide_buildsystem_register_types (PeasObjectModule *module)
diff --git a/libide/ide.h b/libide/ide.h
index f0c9b97..9593570 100644
--- a/libide/ide.h
+++ b/libide/ide.h
@@ -35,6 +35,8 @@ G_BEGIN_DECLS
 #include "buffers/ide-buffer.h"
 #include "buffers/ide-unsaved-file.h"
 #include "buffers/ide-unsaved-files.h"
+#include "buildconfig/ide-buildconfig-configuration.h"
+#include "buildconfig/ide-buildconfig-configuration-provider.h"
 #include "buildsystem/ide-build-manager.h"
 #include "buildsystem/ide-build-pipeline.h"
 #include "buildsystem/ide-build-pipeline-addin.h"
@@ -44,8 +46,6 @@ G_BEGIN_DECLS
 #include "buildsystem/ide-build-stage-transfer.h"
 #include "buildsystem/ide-build-system.h"
 #include "buildsystem/ide-build-target.h"
-#include "buildsystem/ide-buildconfig-configuration.h"
-#include "buildsystem/ide-buildconfig-configuration-provider.h"
 #include "buildsystem/ide-configuration-manager.h"
 #include "buildsystem/ide-configuration.h"
 #include "buildsystem/ide-configuration-provider.h"