GNOME.org
 

[gnome-todo/tingping/fixups] Fix plugin includes

commit 6e8c64e359709249d7cbb7cf27201d28a66149f6
Author: Patrick Griffis <tingping tingping se>
Date:   Mon Jan 18 20:18:20 2016 -0500

    Fix plugin includes

 .gitignore                        |  138 +++++++++++++++----------------------
 common.am                         |    4 +-
 plugins/eds/gtd-panel-scheduled.c |    2 +-
 plugins/eds/gtd-panel-today.c     |    2 +-
 plugins/eds/gtd-plugin-eds.c      |    1 -
 plugins/eds/gtd-plugin-eds.h      |    2 +-
 plugins/eds/gtd-provider-eds.h    |    2 +-
 plugins/eds/gtd-provider-goa.h    |    2 +-
 plugins/eds/gtd-provider-local.h  |    2 +-
 plugins/eds/gtd-task-list-eds.h   |    2 +-
 src/Makefile.am                   |    2 +-
 src/gnome-todo.h                  |    8 +-
 12 files changed, 70 insertions(+), 97 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9eb7032..12a2414 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,82 +1,56 @@
-*.bak
-*.o
-*.la
-*.lo
-*.orig
-*.rej
-*.tab.c
-*.plugin
-*~
-.libs
-.*.sw[nop]
-.deps
-.dirstamp
-.gitignore
-GPATH
-GRTAGS
-GSYMS
-GTAGS
-ID
-INSTALL
-Makefile
-Makefile.in
-TAGS
-aclocal.m4
-autom4te.cache
-build
-build-aux
-config
-config.cache
-config.h
-config.h.in
-config.log
-config.lt
-config.status
-config.status.lineno
-configure
-configure.lineno
-intltool-extract
-intltool-extract.in
-intltool-merge
-intltool-merge.in
-intltool-update
-intltool-update.in
-libtool
-m4/appstream-xml.m4
-m4/ax_append_compile_flags.m4
-m4/ax_append_flag.m4
-m4/ax_append_link_flags.m4
-m4/ax_check_compile_flag.m4
-m4/ax_check_enable_debug.m4
-m4/ax_check_link_flag.m4
-m4/ax_compiler_flags.m4
-m4/ax_compiler_flags_cflags.m4
-m4/ax_compiler_flags_gir.m4
-m4/ax_compiler_flags_ldflags.m4
-m4/ax_is_release.m4
-m4/ax_require_defined.m4
-m4/glib-gettext.m4
-m4/gsettings.m4
-m4/intltool.m4
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-m4/nls.m4
-m4/pkg.m4
-po/*.gmo
-po/*.mo
-po/.intltool-merge-cache
-po/Makefile
-po/Makefile.in
-po/Makefile.in.in
-po/POTFILES
-po/gnome-todo.pot
-po/stamp-it
-so_locations
-src/.deps
-src/Makefile
-src/Makefile.in
-stamp-h1
-tags
+/*.bak
+/*.o
+/*.orig
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.dirstamp
+/.gitignore
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/INSTALL
+/Makefile
+/Makefile.in
+/TAGS
+/aclocal.m4
+/autom4te.cache
+/build
+/build-aux
+/config
+/config.cache
+/config.h
+/config.h.in
+/config.log
+/config.lt
+/config.status
+/config.status.lineno
+/configure
+/configure.lineno
+/intltool-extract
+/intltool-extract.in
+/intltool-merge
+/intltool-merge.in
+/intltool-update
+/intltool-update.in
+/libtool
+/m4
+/po/*.gmo
+/po/*.mo
+/po/.intltool-merge-cache
+/po/Makefile
+/po/Makefile.in
+/po/Makefile.in.in
+/po/POTFILES
+/po/gnome-todo.pot
+/po/stamp-it
+/so_locations
+/src/.deps
+/src/Makefile
+/src/Makefile.in
+/stamp-h1
+/tags
diff --git a/common.am b/common.am
index ce557d1..74cc998 100644
--- a/common.am
+++ b/common.am
@@ -1,8 +1,8 @@
 plugindir = @GNOME_TODO_PLUGIN_DIR@
 
 GNOME_TODO_PLUGIN_CFLAGS = \
-       $(GNOME_TODO_CFLAGS)
-
+       $(GNOME_TODO_CFLAGS) \
+       -I$(top_srcdir)/src
 
 GNOME_TODO_PLUGIN_WARN_CFLAGS = \
        $(GNOME_TODO_WARN_CFLAGS)
diff --git a/plugins/eds/gtd-panel-scheduled.c b/plugins/eds/gtd-panel-scheduled.c
index 76787f8..b55c81e 100644
--- a/plugins/eds/gtd-panel-scheduled.c
+++ b/plugins/eds/gtd-panel-scheduled.c
@@ -19,7 +19,7 @@
 #include "gtd-panel-scheduled.h"
 
 #include <glib/gi18n.h>
-#include <gnome-todo/gnome-todo.h>
+#include <gnome-todo.h>
 
 struct _GtdPanelScheduled
 {
diff --git a/plugins/eds/gtd-panel-today.c b/plugins/eds/gtd-panel-today.c
index fdaf231..1325e97 100644
--- a/plugins/eds/gtd-panel-today.c
+++ b/plugins/eds/gtd-panel-today.c
@@ -19,7 +19,7 @@
 #include "gtd-panel-today.h"
 
 #include <glib/gi18n.h>
-#include <gnome-todo/gnome-todo.h>
+#include <gnome-todo.h>
 
 struct _GtdPanelToday
 {
diff --git a/plugins/eds/gtd-plugin-eds.c b/plugins/eds/gtd-plugin-eds.c
index 461c764..a03db53 100644
--- a/plugins/eds/gtd-plugin-eds.c
+++ b/plugins/eds/gtd-plugin-eds.c
@@ -24,7 +24,6 @@
 
 #include <glib/gi18n.h>
 #include <glib-object.h>
-#include <gnome-todo/gnome-todo.h>
 
 /**
  * The #GtdPluginEds is a class that loads all the
diff --git a/plugins/eds/gtd-plugin-eds.h b/plugins/eds/gtd-plugin-eds.h
index 24ef1d0..368be26 100644
--- a/plugins/eds/gtd-plugin-eds.h
+++ b/plugins/eds/gtd-plugin-eds.h
@@ -20,7 +20,7 @@
 #define GTD_EDS_PLUGIN_H
 
 #include <glib.h>
-#include <gnome-todo/gtd-activatable.h>
+#include <gnome-todo.h>
 
 G_BEGIN_DECLS
 
diff --git a/plugins/eds/gtd-provider-eds.h b/plugins/eds/gtd-provider-eds.h
index 2b53751..40568c7 100644
--- a/plugins/eds/gtd-provider-eds.h
+++ b/plugins/eds/gtd-provider-eds.h
@@ -20,7 +20,7 @@
 #define GTD_PROVIDER_EDS_H
 
 #include <glib.h>
-#include <gnome-todo/gnome-todo.h>
+#include <gnome-todo.h>
 #include <libecal/libecal.h>
 #include <libedataserverui/libedataserverui.h>
 
diff --git a/plugins/eds/gtd-provider-goa.h b/plugins/eds/gtd-provider-goa.h
index 0146d01..5847a4c 100644
--- a/plugins/eds/gtd-provider-goa.h
+++ b/plugins/eds/gtd-provider-goa.h
@@ -22,7 +22,7 @@
 #include "gtd-provider-eds.h"
 
 #include <glib.h>
-#include <gnome-todo/gnome-todo.h>
+#include <gnome-todo.h>
 #include <goa/goa.h>
 
 G_BEGIN_DECLS
diff --git a/plugins/eds/gtd-provider-local.h b/plugins/eds/gtd-provider-local.h
index fab47d8..8d77bf6 100644
--- a/plugins/eds/gtd-provider-local.h
+++ b/plugins/eds/gtd-provider-local.h
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-#include <gnome-todo/gnome-todo.h>
+#include <gnome-todo.h>
 #include <libecal/libecal.h>
 #include <libedataserverui/libedataserverui.h>
 
diff --git a/plugins/eds/gtd-task-list-eds.h b/plugins/eds/gtd-task-list-eds.h
index 2579f37..aa3f7b1 100644
--- a/plugins/eds/gtd-task-list-eds.h
+++ b/plugins/eds/gtd-task-list-eds.h
@@ -20,7 +20,7 @@
 #define GTD_TASK_LIST_EDS_H
 
 #include <glib-object.h>
-#include <gnome-todo/gnome-todo.h>
+#include <gnome-todo.h>
 #include <libecal/libecal.h>
 
 G_BEGIN_DECLS
diff --git a/src/Makefile.am b/src/Makefile.am
index 82097e0..dcaec6c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -100,7 +100,7 @@ gnome_todo_LDADD = \
 # Export headers to [PREFIX]/include/gnome-todo
 #
 gnome_todo_includedir = $(includedir)/gnome-todo
-gnome_todo_include_HEADERS = \
+nobase_gnome_todo_include_HEADERS = \
        interfaces/gtd-activatable.h \
        interfaces/gtd-panel.h \
        interfaces/gtd-provider.h \
diff --git a/src/gnome-todo.h b/src/gnome-todo.h
index 7730e29..9fa2586 100644
--- a/src/gnome-todo.h
+++ b/src/gnome-todo.h
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gtd-activatable.h"
-#include "gtd-panel.h"
-#include "gtd-provider.h"
-#include "gtd-notification.h"
+#include "interfaces/gtd-activatable.h"
+#include "interfaces/gtd-panel.h"
+#include "interfaces/gtd-provider.h"
+#include "notification/gtd-notification.h"
 #include "gtd-enums.h"
 #include "gtd-manager.h"
 #include "gtd-object.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]