[gedit/wip/gcode] Move gcode/ inside gedit/

[Sébastien Wilmet <swilmet src gnome org>]

commit dffdb92a035761596f0e05d2c40158c8573fd35c
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Wed May 6 14:42:32 2015 +0200

    Move gcode/ inside gedit/
    
    This will be needed for GeditDocument and other gedit public classes.
    GeditDocument needs to be a subclass of GcodeDocument, so the
    GcodeDocument and/or GcodeDocumentClass structs need to be public (for
    gedit plugins). So the idea is to have one or more headers in gcode that
    are installed with the other gedit headers. So those gcode headers need
    to be in a 'gedit' directory.
    
    So in gedit-document.h we could include a gcode public header like this:
     #include <gedit/gcode/gcode-gedit.h>
    
    Another solution is to have an include like this:
     #include <gcode/gcode-blah.h>
    
    But the latter would make the gcode namespace "public" for installed
    headers in the system. It's better to keep it inside gedit.

 Makefile.am                                     |    2 +-
 gcode/Makefile.am                               |   30 -----------------------
 gedit/Makefile.am                               |    2 +-
 gedit/gcode/Makefile.am                         |   30 +++++++++++++++++++++++
 {gcode => gedit/gcode}/gcode-debug.c            |    0
 {gcode => gedit/gcode}/gcode-debug.h            |    0
 {gcode => gedit/gcode}/gcode-document.c         |    0
 {gcode => gedit/gcode}/gcode-document.h         |    0
 {gcode => gedit/gcode}/gcode-metadata-manager.c |    0
 {gcode => gedit/gcode}/gcode-metadata-manager.h |    0
 {gcode => gedit/gcode}/gcode-utils.c            |    0
 {gcode => gedit/gcode}/gcode-utils.h            |    0
 {gcode => gedit/gcode}/gcode.h                  |    0
 13 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5df5a13..c0b7928 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,7 +95,7 @@ include win32/Makefile.am
 include osx/bundle/data/Makefile.am
 include tests/Makefile.am
 include plugins/Makefile.am
-include gcode/Makefile.am
+include gedit/gcode/Makefile.am
 include gedit/Makefile.am
 
 @GSETTINGS_RULES@
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index e49e121..2260a0c 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -37,7 +37,7 @@ gedit_libgedit_la_LDFLAGS = -avoid-version -export-dynamic -no-undefined -export
 # GEDIT_LIBS must be the last to ensure correct order on some platforms
 gedit_libgedit_la_LIBADD =                     \
        $(top_builddir)/libgd/libgd.la          \
-       $(top_builddir)/gcode/libgcode.la       \
+       $(top_builddir)/gedit/gcode/libgcode.la \
        $(GEDIT_LIBS)                           \
        $(GTK_MAC_LIBS)
 
diff --git a/gedit/gcode/Makefile.am b/gedit/gcode/Makefile.am
new file mode 100644
index 0000000..79687ea
--- /dev/null
+++ b/gedit/gcode/Makefile.am
@@ -0,0 +1,30 @@
+noinst_LTLIBRARIES += gedit/gcode/libgcode.la
+
+gedit_gcode_libgcode_la_CPPFLAGS =     \
+       -I$(top_srcdir)/gedit/gcode     \
+       -I$(top_builddir)/gedit/gcode
+
+gedit_gcode_libgcode_la_CFLAGS =       \
+       $(GEDIT_CFLAGS)                 \
+       $(GTK_MAC_CFLAGS)               \
+       $(WARN_CFLAGS)                  \
+       $(DISABLE_DEPRECATED_CFLAGS)    \
+       $(INTROSPECTION_CFLAGS)
+
+gedit_gcode_libgcode_la_LIBADD =       \
+       $(GEDIT_LIBS)                   \
+       $(GTK_MAC_LIBS)                 \
+       $(INTROSPECTION_LIBS)
+
+gedit_gcode_libgcode_la_LDFLAGS = -no-undefined
+
+gedit_gcode_libgcode_la_SOURCES =                      \
+       gedit/gcode/gcode.h                             \
+       gedit/gcode/gcode-debug.c                       \
+       gedit/gcode/gcode-debug.h                       \
+       gedit/gcode/gcode-document.c                    \
+       gedit/gcode/gcode-document.h                    \
+       gedit/gcode/gcode-metadata-manager.c            \
+       gedit/gcode/gcode-metadata-manager.h            \
+       gedit/gcode/gcode-utils.c                       \
+       gedit/gcode/gcode-utils.h
diff --git a/gcode/gcode-debug.c b/gedit/gcode/gcode-debug.c
similarity index 100%
rename from gcode/gcode-debug.c
rename to gedit/gcode/gcode-debug.c
diff --git a/gcode/gcode-debug.h b/gedit/gcode/gcode-debug.h
similarity index 100%
rename from gcode/gcode-debug.h
rename to gedit/gcode/gcode-debug.h
diff --git a/gcode/gcode-document.c b/gedit/gcode/gcode-document.c
similarity index 100%
rename from gcode/gcode-document.c
rename to gedit/gcode/gcode-document.c
diff --git a/gcode/gcode-document.h b/gedit/gcode/gcode-document.h
similarity index 100%
rename from gcode/gcode-document.h
rename to gedit/gcode/gcode-document.h
diff --git a/gcode/gcode-metadata-manager.c b/gedit/gcode/gcode-metadata-manager.c
similarity index 100%
rename from gcode/gcode-metadata-manager.c
rename to gedit/gcode/gcode-metadata-manager.c
diff --git a/gcode/gcode-metadata-manager.h b/gedit/gcode/gcode-metadata-manager.h
similarity index 100%
rename from gcode/gcode-metadata-manager.h
rename to gedit/gcode/gcode-metadata-manager.h
diff --git a/gcode/gcode-utils.c b/gedit/gcode/gcode-utils.c
similarity index 100%
rename from gcode/gcode-utils.c
rename to gedit/gcode/gcode-utils.c
diff --git a/gcode/gcode-utils.h b/gedit/gcode/gcode-utils.h
similarity index 100%
rename from gcode/gcode-utils.h
rename to gedit/gcode/gcode-utils.h
diff --git a/gcode/gcode.h b/gedit/gcode/gcode.h
similarity index 100%
rename from gcode/gcode.h
rename to gedit/gcode/gcode.h