[gedit] Rename marshal file in something shorter
- From: Paolo Borelli <pborelli src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gedit] Rename marshal file in something shorter
- Date: Thu, 7 Jan 2010 13:35:20 +0000 (UTC)
commit 185b09b031869bb8e0f1d398ea378969dbc48c53
Author: Paolo Borelli <pborelli gnome org>
Date: Thu Jan 7 14:01:25 2010 +0100
Rename marshal file in something shorter
plugins/spell/Makefile.am | 17 +++++++----------
plugins/spell/gedit-spell-checker-dialog.c | 2 +-
plugins/spell/gedit-spell-checker.c | 4 +---
...ialog-marshal.list => gedit-spell-marshal.list} | 0
4 files changed, 9 insertions(+), 14 deletions(-)
---
diff --git a/plugins/spell/Makefile.am b/plugins/spell/Makefile.am
index 4185fe2..f6dbb38 100644
--- a/plugins/spell/Makefile.am
+++ b/plugins/spell/Makefile.am
@@ -1,11 +1,6 @@
# Spell checker plugin
plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
-BUILT_SOURCES = \
- gedit-spell-checker-dialog-marshal.c \
- gedit-spell-checker-dialog-marshal.h
-
-
INCLUDES = \
-I$(top_srcdir) \
$(GEDIT_CFLAGS) \
@@ -13,6 +8,10 @@ INCLUDES = \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS)
+BUILT_SOURCES = \
+ gedit-spell-marshal.c \
+ gedit-spell-marshal.h
+
plugin_LTLIBRARIES = libspell.la
libspell_la_SOURCES = \
@@ -38,11 +37,11 @@ libspell_la_LIBADD = $(GEDIT_LIBS) $(ENCHANT_LIBS)
uidir = $(GEDIT_PLUGINS_DATA_DIR)/spell
ui_DATA = spell-checker.ui languages-dialog.ui
-gedit-spell-checker-dialog-marshal.h: gedit-spell-checker-dialog-marshal.list $(GLIB_GENMARSHAL)
+gedit-spell-marshal.h: gedit-spell-marshal.list $(GLIB_GENMARSHAL)
$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=gedit_marshal > $@
-gedit-spell-checker-dialog-marshal.c: gedit-spell-checker-dialog-marshal.list $(GLIB_GENMARSHAL)
- $(AM_V_GEN) echo "#include \"gedit-spell-checker-dialog-marshal.h\"" > $@ && \
+gedit-spell-marshal.c: gedit-spell-marshal.list $(GLIB_GENMARSHAL)
+ $(AM_V_GEN) echo "#include \"gedit-spell-marshal.h\"" > $@ && \
$(GLIB_GENMARSHAL) $< --body --prefix=gedit_marshal >> $@
plugin_in_files = spell.gedit-plugin.desktop.in
@@ -61,6 +60,4 @@ CLEANFILES = $(BUILT_SOURCES) $(plugin_DATA)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
-
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/spell/gedit-spell-checker-dialog.c b/plugins/spell/gedit-spell-checker-dialog.c
index 05f8b1d..b3742f9 100644
--- a/plugins/spell/gedit-spell-checker-dialog.c
+++ b/plugins/spell/gedit-spell-checker-dialog.c
@@ -36,7 +36,7 @@
#include <gtk/gtk.h>
#include <gedit/gedit-utils.h>
#include "gedit-spell-checker-dialog.h"
-#include "gedit-spell-checker-dialog-marshal.h"
+#include "gedit-spell-marshal.h"
struct _GeditSpellCheckerDialog
{
diff --git a/plugins/spell/gedit-spell-checker.c b/plugins/spell/gedit-spell-checker.c
index b89981b..51b8d8a 100644
--- a/plugins/spell/gedit-spell-checker.c
+++ b/plugins/spell/gedit-spell-checker.c
@@ -40,9 +40,7 @@
#include "gedit-spell-checker.h"
#include "gedit-spell-utils.h"
-
-/* FIXME - Rename the marshal file - Paolo */
-#include "gedit-spell-checker-dialog-marshal.h"
+#include "gedit-spell-marshal.h"
struct _GeditSpellChecker
{
diff --git a/plugins/spell/gedit-spell-checker-dialog-marshal.list b/plugins/spell/gedit-spell-marshal.list
similarity index 100%
rename from plugins/spell/gedit-spell-checker-dialog-marshal.list
rename to plugins/spell/gedit-spell-marshal.list
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]