proto.h is now generated from proto.head and proto.tail. Implements functionality requested by patch #660404.

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@988 423420c4-83ab-492f-b58f-81f9feb106b5

Makefile.in

@@ -76,11 +76,13 @@ installkeymaps:
 
 .PHONY: proto
 proto:
-	cproto -DMAKE_PROTO -o proto.h \
+	cat proto.head > proto.h
+	cproto -DMAKE_PROTO \
 	bitmap.c cache.c channels.c cliprdr.c disk.c mppc.c ewmhints.c	\
 	iso.c licence.c mcs.c orders.c parallel.c printer.c printercache.c \
 	pstcache.c rdesktop.c rdp5.c rdp.c rdpdr.c rdpsnd.c rdpsnd_oss.c \
-	secure.c serial.c tcp.c xclip.c xkeymap.c xwin.c
+	secure.c serial.c tcp.c xclip.c xkeymap.c xwin.c >> proto.h
+	cat proto.tail >> proto.h
 
 .PHONY: clean
 clean:
@@ -110,6 +112,8 @@ rdesktop-$(VERSION).tar.gz: Makefile configure
 	rdesktop-$(VERSION)/rdesktop.spec \
 	rdesktop-$(VERSION)/*.c \
 	rdesktop-$(VERSION)/*.h \
+	rdesktop-$(VERSION)/proto.head \
+	rdesktop-$(VERSION)/proto.tail \
 	rdesktop-$(VERSION)/keymaps/?? \
 	rdesktop-$(VERSION)/keymaps/??-?? \
 	rdesktop-$(VERSION)/keymaps/common \

proto.head

@@ -0,0 +1,25 @@
+/* -*- c-basic-offset: 8 -*-
+   rdesktop: A Remote Desktop Protocol client.
+   Copyright (C) Matthew Chapman 1999-2005
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef RDESKTOP_PROTO_H
+#define RDESKTOP_PROTO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif

proto.tail

@@ -0,0 +1,6 @@
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif