[Pkg-telepathy-commits] [libnice] 202/265: Remove all traces of compile time marshallers

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository libnice.

commit 8eab01825d8efa533957e7468b265428e2162b32
Author: Olivier Crête <olivier.crete at ocrete.ca>
Date:   Tue Apr 1 11:00:55 2014 -0400

    Remove all traces of compile time marshallers
---
 README.win32                       | 7 +------
 agent/discovery.c                  | 1 -
 docs/reference/libnice/Makefile.am | 2 +-
 win32/dogenmarshal.cmd             | 3 ---
 win32/vs9/libnice.vcproj           | 8 --------
 5 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/README.win32 b/README.win32
index 7e8e552..3b1151a 100644
--- a/README.win32
+++ b/README.win32
@@ -44,12 +44,7 @@ libnice
     |-------- src
     |--- ...
 
-3) Generate agent-signals-marshal files
-
-Launch script win32/dogenmarshal.cmd on the win32 folder to generate agent/agent-signals-marshal.h and
-agent/agent-signals-marshal.c
-
-4) Open win32/libnice.sln with Microsoft Visual Studio 2008
+3) Open win32/libnice.sln with Microsoft Visual Studio 2008
 
 Build solution, output will be on libnice/win32/vs9/libnice/bin/Win32_Debug or libnice/win32/vs9/libnice/bin/Win32_Release
 depending on the configuration chosen.
diff --git a/agent/discovery.c b/agent/discovery.c
index e7f3043..2d9c975 100644
--- a/agent/discovery.c
+++ b/agent/discovery.c
@@ -55,7 +55,6 @@
 
 #include "agent.h"
 #include "agent-priv.h"
-#include "agent-signals-marshal.h"
 #include "component.h"
 #include "discovery.h"
 #include "stun/usages/bind.h"
diff --git a/docs/reference/libnice/Makefile.am b/docs/reference/libnice/Makefile.am
index 5356a21..74e9d67 100644
--- a/docs/reference/libnice/Makefile.am
+++ b/docs/reference/libnice/Makefile.am
@@ -55,7 +55,7 @@ CFILE_GLOB=$(top_srcdir)/agent/agent.c \
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
 IGNORE_HFILES= conncheck.h discovery.h stream.h component.h agent-priv.h \
-	agent-signals-marshal.h	iostream.h inputstream.h outputstream.h \
+	iostream.h inputstream.h outputstream.h \
 	gstnice.h gstnicesrc.h gstnicesink.h  \
 	md5.h sha1.h stunhmac.h utils.h rand.h stun5389.h stuncrc32.h
 
diff --git a/win32/dogenmarshal.cmd b/win32/dogenmarshal.cmd
deleted file mode 100644
index 0928f1d..0000000
--- a/win32/dogenmarshal.cmd
+++ /dev/null
@@ -1,3 +0,0 @@
-..\glib\bin\glib-genmarshal.exe --header --prefix=agent_marshal ..\agent\agent-signals-marshal.list > ..\agent\agent-signals-marshal.h
-echo #include "agent-signals-marshal.h" > ..\agent\agent-signals-marshal.c
-..\glib\bin\glib-genmarshal.exe --body --prefix=agent_marshal ..\agent\agent-signals-marshal.list >> ..\agent\agent-signals-marshal.c
diff --git a/win32/vs9/libnice.vcproj b/win32/vs9/libnice.vcproj
index 5aaf852..a4c6bde 100644
--- a/win32/vs9/libnice.vcproj
+++ b/win32/vs9/libnice.vcproj
@@ -191,14 +191,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\agent\agent-signals-marshal.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\agent-signals-marshal.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\agent\agent.c"
 				>
 			</File>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/libnice.git