Revert "make-dissectors: Be more resilient with whitespace"

This reverts commit ed9d08552049d061a8951f2dee5bc7b73173c14d.

It's causing a segfault on our Windows buildbots.

Change-Id: I3cdd31955bdec7be3ad91cff4af8dc3efdc9e8b7
Reviewed-on: https://code.wireshark.org/review/24510
Reviewed-by: João Valverde <j@v6e.pt>

4 files changed, 7 insertions, 7 deletions

diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
index 9ed4b7d27b..1f2771c3f2 100644
--- a/epan/dissectors/CMakeLists.txt
+++ b/epan/dissectors/CMakeLists.txt
@@ -1848,6 +1848,7 @@ source_group(dissector-support FILES ${DISSECTOR_SUPPORT_SRC})
 set(DISSECTOR_FILES
 	${DISSECTOR_SRC}
 	${PIDL_DISSECTOR_SRC}
+	${PIDL_DISSECTOR_AUTOGEN_SRC}
 	${ASN1_DISSECTOR_SRC}
 	${NCP2222_DISSECTOR_SRC}
 	${CUSTOM_DISSECTOR_SRC}
@@ -1865,7 +1866,7 @@ target_link_libraries(make-dissectors ${GLIB2_LIBRARIES})
 
 file(GENERATE
 	OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/dissectors.c.in"
-	CONTENT "$<JOIN:${ALL_DISSECTOR_SRC},\n>\n"
+	CONTENT "$<JOIN:${ALL_DISSECTOR_SRC}, >"
 )
 add_custom_command(
 	OUTPUT dissectors.c
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index 0d58216c47..1b6d77c0bd 100644
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -1939,7 +1939,7 @@ x11-dissector: $(top_srcdir)/tools/process-x11-fields.pl $(srcdir)/x11-fields $(
 #
 dissectors.c: make-dissectors $(ALL_DISSECTORS_SRC)
 	@echo Making dissectors.c
-	$(file >$@.in) $(foreach O,$(filter %.c,$^),$(file >>$@.in,$O))
+	$(file >$@.in,$(filter %.c,$^))
 	$(builddir)/make-dissectors @$@.in > $@
 	@rm $@.in
 
diff --git a/epan/dissectors/dcerpc/CMakeLists.txt b/epan/dissectors/dcerpc/CMakeLists.txt
index f417482ea8..0b044e1352 100644
--- a/epan/dissectors/dcerpc/CMakeLists.txt
+++ b/epan/dissectors/dcerpc/CMakeLists.txt
@@ -66,6 +66,8 @@ foreach(PROTOCOL_NAME IN LISTS PIDL_DISSECTOR_NAMES)
 	)
 endforeach()
 
+set(PIDL_DISSECTOR_AUTOGEN_SRC ${PIDL_DISSECTOR_SRC} PARENT_SCOPE)
+
 # TODO should probably just merge this into pidl-dissectors
 add_custom_target(idl2wrs-dissectors ALL DEPENDS ${PIDL_DISSECTOR_TARGETS})
 set_target_properties(idl2wrs-dissectors
diff --git a/epan/dissectors/make-dissectors.c b/epan/dissectors/make-dissectors.c
index 0fcc015207..b023da7877 100644
--- a/epan/dissectors/make-dissectors.c
+++ b/epan/dissectors/make-dissectors.c
@@ -15,10 +15,6 @@
 
 #define ARRAY_RESERVED_SIZE     2048
 
-#ifndef SEP
-  #define SEP     "\n"
-#endif
-
 GRegex *protos_regex, *handoffs_regex;
 
 static int
@@ -61,7 +57,7 @@ scan_list(const char *list, GPtrArray *protos, GPtrArray *handoffs)
 
     if (!g_file_get_contents(list, &contents, NULL, NULL))
         return;
-    for (arg = strtok(contents, SEP); arg != NULL; arg = strtok(NULL, SEP)) {
+    for (arg = strtok(contents, " \n"); arg != NULL; arg = strtok(NULL, " \n")) {
         scan_file(arg, protos, handoffs);
     }
     g_free(contents);
@@ -108,6 +104,7 @@ int main(int argc, char **argv)
            " * \"make-dissectors\".\n"
            " */\n"
            "\n"
+           "#include <ws_symbol_export.h>\n"
            "#include <dissectors.h>\n"
            "\n");