We don't care what source files are "dissector" source files, we only

need to care whether source files should be scanned for registration
functions.

Reduce the number of macros we define in Makefile.common.inc, getting
rid of some only used internally.

svn path=/trunk/; revision=47556

4 files changed, 41 insertions, 114 deletions

diff --git a/plugins/Makefile.common.inc b/plugins/Makefile.common.inc
index 7b429e11c3..e04357ac04 100644
--- a/plugins/Makefile.common.inc
+++ b/plugins/Makefile.common.inc
@@ -27,8 +27,8 @@
 # C vs. C++ - this is used on Windows to generated lists of object files
 # with .c=.obj or .cpp=.obj
 #
-# Dissector vs. non-dissector - dissector files are scanned for
-# registration functions, non-dissector files aren't.
+# Register vs. non-register - register files are scanned for registration
+# functions, non-register files aren't.
 #
 # Flex-generated, Lemon-generated, and non-generated:
 #
@@ -58,117 +58,47 @@
 #
 
 #
-# All Flex-generated dissector source files.
+# All source files to be scanned for registration routines.
 #
-FLEX_GENERATED_DISSECTOR_SRC_FILES = \
-	$(FLEX_GENERATED_DISSECTOR_C_FILES) \
-	$(FLEX_GENERATED_DISSECTOR_CPP_FILES)
-
-#
-# All Flex-generated non-dissector source files.
-#
-FLEX_GENERATED_SUPPORT_SRC_FILES = \
-	$(FLEX_GENERATED_SUPPORT_C_FILES) \
-	$(FLEX_GENERATED_SUPPORT_CPP_FILES)
-
-#
-# All Flex-generated source files.
-#
-FLEX_GENERATED_SRC_FILES = \
-	$(FLEX_GENERATED_DISSECTOR_SRC_FILES) \
-	$(FLEX_GENERATED_SUPPORT_SRC_FILES)
-
-#
-# All Lemon-generated dissector source files.
-#
-LEMON_GENERATED_DISSECTOR_SRC_FILES = \
-	$(LEMON_GENERATED_DISSECTOR_C_FILES) \
-	$(LEMON_GENERATED_DISSECTOR_CPP_FILES)
-
-#
-# All Lemon-generated non-dissector source files.
-#
-LEMON_GENERATED_SUPPORT_SRC_FILES = \
-	$(LEMON_GENERATED_SUPPORT_C_FILES) \
-	$(LEMON_GENERATED_SUPPORT_CPP_FILES)
-
-#
-# All Lemon-generated source files.
-#
-LEMON_GENERATED_SRC_FILES = \
-	$(LEMON_GENERATED_DISSECTOR_SRC_FILES) \
-	$(LEMON_GENERATED_SUPPORT_SRC_FILES)
-
-#
-# All non-generated dissector source files.
-#
-DISSECTOR_SRC_FILES = \
-	$(DISSECTOR_C_FILES) \
-	$(DISSECTOR_CPP_FILES)
-
-#
-# All generated dissector source files.
-#
-GENERATED_DISSECTOR_SRC_FILES = \
-	$(FLEX_GENERATED_DISSECTOR_SRC_FILES) \
-	$(LEMON_GENERATED_DISSECTOR_SRC_FILES)
-
-#
-# All non-generated non-dissector source files.
-#
-SUPPORT_SRC_FILES = \
-	$(SUPPORT_C_FILES) \
-	$(SUPPORT_CPP_FILES)
+REGISTER_SRC_FILES = \
+	$(FLEX_GENERATED_REGISTER_C_FILES) \
+	$(FLEX_GENERATED_REGISTER_CPP_FILES) \
+	$(LEMON_GENERATED_REGISTER_C_FILES) \
+	$(LEMON_GENERATED_REGISTER_CPP_FILES) \
+	$(REGISTER_C_FILES) \
+	$(REGISTER_CPP_FILES)
 
 #
 # All distributed source files.
 #
 SRC_FILES = \
-	$(DISSECTOR_SRC_FILES) \
-	$(SUPPORT_SRC_FILES) \
-	$(FLEX_GENERATED_SRC_FILES)
+	$(FLEX_GENERATED_C_FILES) \
+	$(FLEX_GENERATED_CPP_FILES) \
+	$(C_FILES) \
+	$(CPP_FILES)
 
 #
 # All non-distributed source files.
 #
 NODIST_SRC_FILES = \
-	$(LEMON_GENERATED_SRC_FILES)
+	$(LEMON_GENERATED_C_FILES) \
+	$(LEMON_GENERATED_CPP_FILES)
 
 #
 # All generated source files.
 #
 GENERATED_SRC_FILES = \
-	$(FLEX_GENERATED_SRC_FILES) \
-	$(LEMON_GENERATED_SRC_FILES)
+	$(FLEX_GENERATED_C_FILES) \
+	$(FLEX_GENERATED_CPP_FILES) \
+	$(LEMON_GENERATED_C_FILES) \
+	$(LEMON_GENERATED_CPP_FILES)
 
 #
 # All "clean" source files; they can be compiled with the regular
 # warning options, including -Werror with GCC-compatible compilers,
 # and can be run through checkAPI.  Neither Flex-generated nor
-# Lemon-generated files can be guaranteed to be clean.
+# Lemon-generated files can currently be guaranteed to be clean.
 #
 CLEAN_SRC_FILES = \
-	$(DISSECTOR_SRC_FILES) \
-	$(SUPPORT_C_FILES)
-
-#
-# All C source files.
-#
-C_FILES = \
-	$(FLEX_GENERATED_DISSECTOR_C_FILES) \
-	$(FLEX_GENERATED_SUPPORT_C_FILES) \
-	$(LEMON_GENERATED_DISSECTOR_C_FILES) \
-	$(LEMON_GENERATED_SUPPORT_C_FILES) \
-	$(DISSECTOR_C_FILES) \
-	$(SUPPORT_C_FILES)
-
-#
-# All C++ source files.
-#
-CPP_FILES = \
-	$(FLEX_GENERATED_DISSECTOR_CPP_FILES) \
-	$(FLEX_GENERATED_SUPPORT_CPP_FILES) \
-	$(LEMON_GENERATED_DISSECTOR_CPP_FILES) \
-	$(LEMON_GENERATED_SUPPORT_CPP_FILES) \
-	$(DISSECTOR_CPP_FILES) \
-	$(SUPPORT_CPP_FILES)
+	$(C_FILES) \
+	$(CPP_FILES)
diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am
index 834796e99c..895a365ce6 100644
--- a/plugins/mate/Makefile.am
+++ b/plugins/mate/Makefile.am
@@ -72,8 +72,7 @@ LIBS =
 # preceded only by "void " starting in column zero, and must not be
 # inside #if.
 #
-# DISSECTOR_SRC_FILES and NODIST_DISSECTOR_SRC_FILES are assumed to have
-# all the files that need to be scanned.
+# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned.
 #
 # For some unknown reason, having a big "for" loop in the Makefile
 # to scan all the files doesn't work with some "make"s; they seem to
@@ -91,16 +90,16 @@ LIBS =
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(DISSECTOR_SRC_FILES) $(NODIST_DISSECTOR_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
+plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
     $(top_srcdir)/tools/make-dissector-reg.py
 	@if test -n "$(PYTHON)"; then \
 		echo Making plugin.c with python ; \
 		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-		    plugin $(DISSECTOR_SRC_FILES) $(GENERATED_DISSECTOR_SRC_FILES) ; \
+		    plugin $(REGISTER_SRC_FILES) ; \
 	else \
 		echo Making plugin.c with shell script ; \
 		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-		    $(plugin_src) plugin $(DISSECTOR_SRC_FILES) $(GENERATED_DISSECTOR_SRC_FILES) ; \
+		    $(plugin_src) plugin $(REGISTER_SRC_FILES) ; \
 	fi
 
 #
diff --git a/plugins/mate/Makefile.common b/plugins/mate/Makefile.common
index 4009ddb5bc..2de809a29f 100644
--- a/plugins/mate/Makefile.common
+++ b/plugins/mate/Makefile.common
@@ -29,7 +29,7 @@ PLUGIN_NAME = mate
 #
 # Files generated by Flex.
 #
-FLEX_GENERATED_SUPPORT_C_FILES = \
+FLEX_GENERATED_C_FILES = \
 	mate_parser.c	
 
 FLEX_GENERATED_HEADER_FILES = \
@@ -38,22 +38,21 @@ FLEX_GENERATED_HEADER_FILES = \
 #
 # Files generated by Lemon.
 #
-LEMON_GENERATED_SUPPORT_C_FILES = \
+LEMON_GENERATED_C_FILES = \
 	mate_grammar.c
 
 LEMON_GENERATED_HEADER_FILES = \
 	mate_grammar.h
 
-# Non-generated dissector sources (without any helpers)
-DISSECTOR_C_FILES = \
+# Non-generated sources to be scanned for registration routines
+REGISTER_C_FILES = \
 	packet-mate.c
 
-# Non-generated dissector helpers. They're included in the source files
-# in this directory, but they're not dissectors themselves, i.e. they're
-# not used to generate "register.c").
-SUPPORT_C_FILES =	\
-	mate_setup.c	\
-	mate_runtime.c	\
+# Non-generated sources
+C_FILES = \
+	$(REGISTER_C_FILES) \
+	mate_setup.c \
+	mate_runtime.c \
 	mate_util.c
 
 # Headers.
diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake
index 8f8708cdd4..c9fd4f4ad5 100644
--- a/plugins/mate/Makefile.nmake
+++ b/plugins/mate/Makefile.nmake
@@ -65,8 +65,7 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
 # preceded only by "void " starting in column zero, and must not be
 # inside #if.
 #
-# DISSECTOR_SRC_FILES and NODIST_DISSECTOR_SRC_FILES are assumed to have
-# all the files that need to be scanned.
+# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned.
 #
 # For some unknown reason, having a big "for" loop in the Makefile
 # to scan all the files doesn't work with some "make"s; they seem to
@@ -85,13 +84,13 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
 # All subsequent arguments are the files to scan.
 #
 !IFDEF PYTHON
-plugin.c: $(DISSECTOR_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py
+plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py
 	@echo Making plugin.c (using python)
-	@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(DISSECTOR_SRC_FILES) $(NODIST_DISSECTOR_SRC_FILES)
+	@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) $(NODIST_REGISTER_SRC_FILES)
 !ELSE
-plugin.c: $(DISSECTOR_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg
+plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg
 	@echo Making plugin.c (using sh)
-	@$(SH) ../../tools/make-dissector-reg . plugin $(DISSECTOR_SRC_FILES) $(NODIST_DISSECTOR_SRC_FILES)
+	@$(SH) ../../tools/make-dissector-reg . plugin $(REGISTER_SRC_FILES) $(NODIST_REGISTER_SRC_FILES)
 !ENDIF
 
 !ENDIF