GNOME.org
 

[gnome-builder/wip/nacho/doap-contrib: 1/3] Move doap code to contrib/doap

commit 4fa667cc7613e7360fcdda05452d03468b1dd7cd
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Mon Jan 18 17:25:19 2016 +0100

    Move doap code to contrib/doap

 configure.ac                               |    1 +
 contrib/Makefile.am                        |    1 +
 contrib/doap/Makefile.am                   |   21 +++++++++++++++++++++
 {libide => contrib}/doap/ide-doap-person.c |    0
 {libide => contrib}/doap/ide-doap-person.h |    0
 {libide => contrib}/doap/ide-doap.c        |    0
 {libide => contrib}/doap/ide-doap.h        |    0
 libide/Makefile.am                         |   10 ++--------
 libide/ide-context.c                       |    2 +-
 libide/ide-project-info.h                  |    2 +-
 libide/ide.h                               |    2 --
 plugins/autotools/Makefile.am              |    1 +
 plugins/build-tools/Makefile.am            |    1 +
 plugins/clang/Makefile.am                  |    1 +
 plugins/command-bar/Makefile.am            |    1 +
 plugins/ctags/Makefile.am                  |    1 +
 plugins/devhelp/Makefile.am                |    1 +
 plugins/file-search/Makefile.am            |    1 +
 plugins/gcc/Makefile.am                    |    1 +
 plugins/git/Makefile.am                    |    1 +
 plugins/project-tree/Makefile.am           |    1 +
 plugins/support/Makefile.am                |    1 +
 plugins/symbol-tree/Makefile.am            |    1 +
 plugins/sysmon/Makefile.am                 |    1 +
 plugins/terminal/Makefile.am               |    1 +
 plugins/vala-pack/Makefile.am              |    1 +
 src/Makefile.am                            |    1 +
 27 files changed, 43 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6d86eff..e85f82a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -424,6 +424,7 @@ AC_CONFIG_FILES([
        contrib/rg/Makefile
        contrib/search/Makefile
        contrib/xml/Makefile
+       contrib/doap/Makefile
 
        libide/ide-debug.h
        libide/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index d01f238..22f7571 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -7,6 +7,7 @@ SUBDIRS = \
        rg \
        search \
        xml \
+       doap \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/contrib/doap/Makefile.am b/contrib/doap/Makefile.am
new file mode 100644
index 0000000..aa75ca6
--- /dev/null
+++ b/contrib/doap/Makefile.am
@@ -0,0 +1,21 @@
+noinst_LTLIBRARIES = libdoap.la
+
+libdoap_la_CPPFLAGS = \
+       -I$(top_srcdir)/contrib/xml \
+       $(NULL)
+
+libdoap_la_SOURCES = \
+       ide-doap.c \
+       ide-doap.h \
+       ide-doap-person.c \
+       ide-doap-person.h \
+       $(NULL)
+
+libdoap_la_CFLAGS = \
+       $(XML_CFLAGS)
+
+libdoap_la_LIBADD = \
+       $(XML_LIBS) \
+       $(top_builddir)/contrib/xml/libxml.la
+
+-include $(top_srcdir)/git.mk
diff --git a/libide/doap/ide-doap-person.c b/contrib/doap/ide-doap-person.c
similarity index 100%
rename from libide/doap/ide-doap-person.c
rename to contrib/doap/ide-doap-person.c
diff --git a/libide/doap/ide-doap-person.h b/contrib/doap/ide-doap-person.h
similarity index 100%
rename from libide/doap/ide-doap-person.h
rename to contrib/doap/ide-doap-person.h
diff --git a/libide/doap/ide-doap.c b/contrib/doap/ide-doap.c
similarity index 100%
rename from libide/doap/ide-doap.c
rename to contrib/doap/ide-doap.c
diff --git a/libide/doap/ide-doap.h b/contrib/doap/ide-doap.h
similarity index 100%
rename from libide/doap/ide-doap.h
rename to contrib/doap/ide-doap.h
diff --git a/libide/Makefile.am b/libide/Makefile.am
index eef1348..ee45cf9 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -14,10 +14,6 @@ libide_1_0_la_public_sources = \
        directory/ide-directory-plugin.c \
        directory/ide-directory-vcs.c \
        directory/ide-directory-vcs.h \
-       doap/ide-doap-person.c \
-       doap/ide-doap-person.h \
-       doap/ide-doap.c \
-       doap/ide-doap.h \
        editor/ide-editor-perspective.c \
        editor/ide-editor-perspective.h \
        editor/ide-editor-view-addin.c \
@@ -411,10 +407,9 @@ libide_1_0_la_includes = \
        -I$(top_srcdir)/contrib/nautilus \
        -I$(top_srcdir)/contrib/libeditorconfig \
        -I$(top_srcdir)/contrib/search \
-       -I$(top_srcdir)/contrib/xml \
+       -I$(top_srcdir)/contrib/doap \
        -I$(top_builddir)/data/icons/hicolor \
        -I$(srcdir) \
-       -I$(srcdir)/doap \
        -I$(srcdir)/editor \
        -I$(srcdir)/editorconfig \
        -I$(srcdir)/greeter \
@@ -465,7 +460,7 @@ libide_1_0_la_LIBADD = \
        $(top_builddir)/contrib/libeditorconfig/libeditorconfig.la \
        $(top_builddir)/contrib/nautilus/libnautilus.la \
        $(top_builddir)/contrib/search/libsearch.la \
-       $(top_builddir)/contrib/xml/libxml.la \
+       $(top_builddir)/contrib/doap/libdoap.la \
        $(NULL)
 
 libide_1_0_la_built_sources = \
@@ -489,7 +484,6 @@ endif
 glib_enum_h = ide-enums.h
 glib_enum_c = ide-enums.c
 glib_enum_headers =  \
-       doap/ide-doap.h \
        ide-buffer.h \
        ide-build-result.h \
        ide-diagnostic.h \
diff --git a/libide/ide-context.c b/libide/ide-context.c
index 9ff39dc..97d5de9 100644
--- a/libide/ide-context.c
+++ b/libide/ide-context.c
@@ -46,7 +46,7 @@
 #include "ide-vcs.h"
 #include "ide-recent-projects.h"
 
-#include "doap/ide-doap.h"
+#include "ide-doap.h"
 
 #define RESTORE_FILES_MAX_FILES 20
 
diff --git a/libide/ide-project-info.h b/libide/ide-project-info.h
index 64031fd..0c0b41b 100644
--- a/libide/ide-project-info.h
+++ b/libide/ide-project-info.h
@@ -21,7 +21,7 @@
 
 #include <gio/gio.h>
 
-#include "doap/ide-doap.h"
+#include "ide-doap.h"
 
 G_BEGIN_DECLS
 
diff --git a/libide/ide.h b/libide/ide.h
index 948fd8b..b44aeab 100644
--- a/libide/ide.h
+++ b/libide/ide.h
@@ -122,8 +122,6 @@ G_BEGIN_DECLS
 
 #include "genesis/ide-genesis-addin.h"
 
-#include "doap/ide-doap-person.h"
-#include "doap/ide-doap.h"
 #include "local/ide-local-device.h"
 #include "search/ide-omni-search-row.h"
 #include "util/ide-file-manager.h"
diff --git a/plugins/autotools/Makefile.am b/plugins/autotools/Makefile.am
index acc7693..5ce12c2 100644
--- a/plugins/autotools/Makefile.am
+++ b/plugins/autotools/Makefile.am
@@ -23,6 +23,7 @@ libautotools_plugin_la_SOURCES = \
 libautotools_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/contrib/egg \
+       -I$(top_srcdir)/contrib/doap \
        -I$(top_srcdir)/libide \
        $(NULL)
 
diff --git a/plugins/build-tools/Makefile.am b/plugins/build-tools/Makefile.am
index 7c7da83..fd043c4 100644
--- a/plugins/build-tools/Makefile.am
+++ b/plugins/build-tools/Makefile.am
@@ -32,6 +32,7 @@ libbuild_tools_plugin_la_CFLAGS = \
        $(OPTIMIZE_CFLAGS) \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/contrib/egg \
+       -I$(top_srcdir)/contrib/doap \
        $(NULL)
 
 libbuild_tools_plugin_la_LDFLAGS = \
diff --git a/plugins/clang/Makefile.am b/plugins/clang/Makefile.am
index deb4537..20f623b 100644
--- a/plugins/clang/Makefile.am
+++ b/plugins/clang/Makefile.am
@@ -35,6 +35,7 @@ libclang_plugin_la_CFLAGS = \
        $(CLANG_CFLAGS) \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/contrib/egg \
+       -I$(top_srcdir)/contrib/doap \
        $(NULL)
 
 libclang_plugin_la_LIBADD = \
diff --git a/plugins/command-bar/Makefile.am b/plugins/command-bar/Makefile.am
index 20bc6fa..db74192 100644
--- a/plugins/command-bar/Makefile.am
+++ b/plugins/command-bar/Makefile.am
@@ -41,6 +41,7 @@ libcommand_bar_la_CFLAGS = \
        -I$(top_srcdir)/contrib/egg \
        -I$(top_srcdir)/contrib/gd \
        -I$(top_srcdir)/contrib/nautilus \
+       -I$(top_srcdir)/contrib/doap \
        $(LIBIDE_CFLAGS) \
        $(DEBUG_CFLAGS) \
        $(OPTIMIZE_CFLAGS) \
diff --git a/plugins/ctags/Makefile.am b/plugins/ctags/Makefile.am
index 6001121..dfa4811 100644
--- a/plugins/ctags/Makefile.am
+++ b/plugins/ctags/Makefile.am
@@ -28,6 +28,7 @@ libctags_plugin_la_SOURCES = \
 libctags_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/contrib/egg \
+       -I$(top_srcdir)/contrib/doap \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/libide/util \
        $(NULL)
diff --git a/plugins/devhelp/Makefile.am b/plugins/devhelp/Makefile.am
index 9065c3c..76fab4b 100644
--- a/plugins/devhelp/Makefile.am
+++ b/plugins/devhelp/Makefile.am
@@ -33,6 +33,7 @@ libdevhelp_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        $(DEVHELP_CFLAGS) \
        $(OPTIMIZE_CFLAGS) \
+       -I$(top_srcdir)/contrib/doap \
        -I$(top_srcdir)/libide \
        $(NULL)
 
diff --git a/plugins/file-search/Makefile.am b/plugins/file-search/Makefile.am
index c17e1c0..5f58f0f 100644
--- a/plugins/file-search/Makefile.am
+++ b/plugins/file-search/Makefile.am
@@ -17,6 +17,7 @@ libfile_search_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/contrib/search \
+       -I$(top_srcdir)/contrib/doap \
        $(NULL)
 
 libfile_search_la_LIBADD = \
diff --git a/plugins/gcc/Makefile.am b/plugins/gcc/Makefile.am
index c0458d0..cef1403 100644
--- a/plugins/gcc/Makefile.am
+++ b/plugins/gcc/Makefile.am
@@ -14,6 +14,7 @@ libgcc_plugin_la_SOURCES = \
 libgcc_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/contrib/egg \
+       -I$(top_srcdir)/contrib/doap \
        -I$(top_srcdir)/libide
 
 libgcc_plugin_la_LDFLAGS = \
diff --git a/plugins/git/Makefile.am b/plugins/git/Makefile.am
index 0202f70..d90ce78 100644
--- a/plugins/git/Makefile.am
+++ b/plugins/git/Makefile.am
@@ -32,6 +32,7 @@ libgit_plugin_la_CFLAGS = \
        $(OPTIMIZE_CFLAGS) \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/contrib/egg \
+       -I$(top_srcdir)/contrib/doap \
        $(NULL)
 
 libgit_plugin_la_LIBADD = $(GIT_LIBS)
diff --git a/plugins/project-tree/Makefile.am b/plugins/project-tree/Makefile.am
index b3bdc85..e3d607d 100644
--- a/plugins/project-tree/Makefile.am
+++ b/plugins/project-tree/Makefile.am
@@ -38,6 +38,7 @@ libproject_tree_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        $(OPTIMIZE_CFLAGS) \
        $(DEBUG_CFLAGS) \
+       -I$(top_srcdir)/contrib/doap \
        -I$(top_srcdir)/libide \
        $(NULL)
 
diff --git a/plugins/support/Makefile.am b/plugins/support/Makefile.am
index c227ed9..4ef33d5 100644
--- a/plugins/support/Makefile.am
+++ b/plugins/support/Makefile.am
@@ -26,6 +26,7 @@ libsupport_plugin_la_CFLAGS = \
        $(OPTIMIZE_CFLAGS) \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/contrib/egg \
+       -I$(top_srcdir)/contrib/doap \
        $(NULL)
 
 libsupport_plugin_la_LDFLAGS = \
diff --git a/plugins/symbol-tree/Makefile.am b/plugins/symbol-tree/Makefile.am
index 9f82958..3e27d6a 100644
--- a/plugins/symbol-tree/Makefile.am
+++ b/plugins/symbol-tree/Makefile.am
@@ -25,6 +25,7 @@ libsymbol_tree_la_CFLAGS = \
        $(OPTIMIZE_CFLAGS) \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/contrib/egg \
+       -I$(top_srcdir)/contrib/doap \
        $(NULL)
 
 libsymbol_tree_la_LDFLAGS = \
diff --git a/plugins/sysmon/Makefile.am b/plugins/sysmon/Makefile.am
index e7cd6de..325accf 100644
--- a/plugins/sysmon/Makefile.am
+++ b/plugins/sysmon/Makefile.am
@@ -26,6 +26,7 @@ libsysmon_la_CFLAGS = \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/contrib/egg \
        -I$(top_srcdir)/contrib/rg \
+       -I$(top_srcdir)/contrib/doap \
        $(NULL)
 
 libsysmon_la_LIBADD = \
diff --git a/plugins/terminal/Makefile.am b/plugins/terminal/Makefile.am
index d35dfe0..5115837 100644
--- a/plugins/terminal/Makefile.am
+++ b/plugins/terminal/Makefile.am
@@ -33,6 +33,7 @@ libterminal_la_CFLAGS = \
        $(TERMINAL_CFLAGS) \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/contrib/egg \
+       -I$(top_srcdir)/contrib/doap \
        $(NULL)
 
 libterminal_la_LIBADD = \
diff --git a/plugins/vala-pack/Makefile.am b/plugins/vala-pack/Makefile.am
index 2d26850..b97314a 100644
--- a/plugins/vala-pack/Makefile.am
+++ b/plugins/vala-pack/Makefile.am
@@ -39,6 +39,7 @@ libvala_pack_plugin_la_CFLAGS = \
        $(VALA_CFLAGS) \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/contrib/egg \
+       -I$(top_srcdir)/contrib/doap \
        $(NULL)
 
 libvala_pack_plugin_la_LDFLAGS = \
diff --git a/src/Makefile.am b/src/Makefile.am
index e8858d1..290efc4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,6 +10,7 @@ AM_CPPFLAGS = \
        $(OPTIMIZE_CFLAGS) \
        $(TERMINAL_CFLAGS) \
        -I$(top_builddir)/data/icons/hicolor \
+       -I$(top_srcdir)/contrib/doap \
        -I$(top_builddir)/libide \
        -I$(top_srcdir)/libide \
        $(NULL)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]