Remove unnecessary marshals and rename for future

diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index e1bfd52b921f5092d009cf1d4da74c3e2e74aec7..5d6fb10694927d7a054b0f262c08c5fc6582fd3e 100644 (file)
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -43,10 +43,10 @@ noinst_HEADERS = champlainview.h \
 libchamplain_1_0_la_LIBADD = $(DEPS_LIBS) ../tidy/libtidy-1.0.la
 
 champlain-marshal.h: $(CHAMPLAIN_MARSHAL_LIST)
-       @GLIB_GENMARSHAL@ --header --prefix=champlain_marshal $< > $(CHAMPLAIN_MARSHAL).h 
+       @GLIB_GENMARSHAL@ --header --prefix=cpl_marshal $< > $(CHAMPLAIN_MARSHAL).h 
 
 champlain-marshal.c: $(CHAMPLAIN_MARSHAL_LIST)
-       @GLIB_GENMARSHAL@ --body --prefix=champlain_marshal $< > $(CHAMPLAIN_MARSHAL).c
+       @GLIB_GENMARSHAL@ --body --prefix=cpl_marshal $< > $(CHAMPLAIN_MARSHAL).c
 
 libchamplain_includedir=$(includedir)/libchamplain-1.0/champlain
 libchamplain_include_HEADERS = champlain.h champlainview.h champlain_defines.h champlainlayer.h champlainmarker.h

diff --git a/champlain/champlain-marshal.list b/champlain/champlain-marshal.list
index 38076d6cf12b741922c4e52743bc9e685dadc752..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/champlain/champlain-marshal.list
+++ b/champlain/champlain-marshal.list
@@ -1 +1 @@
-VOID:OBJECT,OBJECT
+