From: Pierre-Luc Beaudoin <pierre-luc@squidy.info>
Date: Sun, 28 Sep 2008 10:25:23 +0000 (-0400)
Subject: Remove unnecessary marshals and rename for future
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89cfe9dd417b8ab82a387824028399a84e258c2b;p=libchamplain

Remove unnecessary marshals and rename for future
---

diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index e1bfd52..5d6fb10 100644
--- 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 38076d6..8b13789 100644
--- a/champlain/champlain-marshal.list
+++ b/champlain/champlain-marshal.list
@@ -1 +1 @@
-VOID:OBJECT,OBJECT
+