summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/.gitignore2
-rw-r--r--src/Makefile.am10
-rw-r--r--src/cmumble.h2
-rw-r--r--src/gen_message_list.sed (renamed from src/gen_messages.sed)6
4 files changed, 10 insertions, 10 deletions
diff --git a/src/.gitignore b/src/.gitignore
index a4818d0..9a096f7 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,4 +1,4 @@
-messages.h
+message_list.h
mumble.pb-c.c
mumble.pb-c.h
protoc-c.sh
diff --git a/src/Makefile.am b/src/Makefile.am
index 8af2758..ef92bee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
bin_PROGRAMS = cmumble
noinst_HEADERS = cmumble.h varint.h io.h connection.h
-nodist_noinst_HEADERS = mumble.pb-c.h messages.h
+nodist_noinst_HEADERS = mumble.pb-c.h message_list.h
cmumble_SOURCES = cmumble.c messages.c varint.c io.c connection.c
nodist_cmumble_SOURCES = mumble.pb-c.c
@@ -15,14 +15,14 @@ AM_CFLAGS = $(GCC_CFLAGS)
BUILT_SOURCES = $(nodist_cmumble_SOURCES) $(nodist_noinst_HEADERS)
MAINTAINERCLEANFILES = mumble.pb-c.c mumble.pb-c.h
-CLEANFILES = messages.h
-EXTRA_DIST = mumble.proto messages.txt gen_messages.sed
+CLEANFILES = message_list.h
+EXTRA_DIST = mumble.proto messages.txt gen_message_list.sed
# Ship files generated by protoc-c in releases,
# so that protoc-c (which pulls in the c++ protobuf) is not needed.
EXTRA_DIST += mumble.pb-c.c mumble.pb-c.h
-messages.h: $(srcdir)/messages.txt $(srcdir)/gen_messages.sed
- $(AM_V_GEN) LC_ALL= LC_COLLATE=C $(SED) -f $(srcdir)/gen_messages.sed $< > $@
+message_list.h: $(srcdir)/messages.txt $(srcdir)/gen_message_list.sed
+ $(AM_V_GEN) LC_ALL= LC_COLLATE=C $(SED) -f $(srcdir)/gen_message_list.sed $< > $@
mumble.pb-c.c mumble.pb-c.h: $(srcdir)/mumble.proto
$(AM_V_GEN) $(builddir)/protoc-c.sh $< $@
diff --git a/src/cmumble.h b/src/cmumble.h
index 9f40d31..63e3ffc 100644
--- a/src/cmumble.h
+++ b/src/cmumble.h
@@ -14,7 +14,7 @@
#include <celt/celt_header.h>
#include "mumble.pb-c.h"
-#include "messages.h"
+#include "message_list.h"
#include "io.h"
#include "connection.h"
diff --git a/src/gen_messages.sed b/src/gen_message_list.sed
index 0013f5d..e1ffbeb 100644
--- a/src/gen_messages.sed
+++ b/src/gen_message_list.sed
@@ -1,7 +1,7 @@
1 {
i\
-#ifndef _MESSAGES_H_ \
-#define _MESSAGES_H_ \
+#ifndef _MESSAGE_LIST_H_ \
+#define _MESSAGE_LIST_H_ \
\
#define MUMBLE_MSGS \\
}
@@ -20,5 +20,5 @@ s/^\(.*\)\n\(.*\)$/\tMUMBLE_MSG(\2, \1) \\/
$ {
a\
\
-#endif /* _MESSAGES_H_ */
+#endif /* _MESSAGE_LIST_H_ */
}