Do a bit more splitting and combining of file names, so that we can

avoid running the checkAPI stuff on Flex-generated files.

svn path=/trunk/; revision=47506

1 files changed, 100 insertions, 41 deletions

diff --git a/plugins/Makefile.common.inc b/plugins/Makefile.common.inc
index 191dd29d0b..7f72d8348f 100644
--- a/plugins/Makefile.common.inc
+++ b/plugins/Makefile.common.inc
@@ -30,86 +30,145 @@
 # Dissector vs. non-dissector - dissector files are scanned for
 # registration functions, non-dissector files aren't.
 #
-# Generated and distributed, generated and not distributed, and not
-# generated - "make maintainer-clean" on UN*X and "nmake distclean"
-# on Windows remove all generated files, "make distclean" on UN*X
-# removes all not-distributed generated files, and non-distributed
-# generated files aren't put into the distribution.
+# Flex-generated, Lemon-generated, and non-generated:
+#
+#	we distribute non-generated files, as they're part of the source,
+#	and distribute Flex-generated files, as we don't require that
+#	people have Flex installed and don't distribute it ourself and
+#	thus can't guarantee that we can run Flex in the build process,
+#	but we don't distribute Lemon-generated files, as we distribute
+#	Lemon and can run it in the build process;
+#
+#	"make maintainer-clean" on UN*X and "nmake maintainer-clean" on
+#	Windows remove all generated files;
+#
+#	"make distclean" on UN*X removes Lemon-generated files, as they're
+#	not in the distribution, but not Flex-generated files, as they
+#	are in the distribution;
+#
+#	"make distclean" on Windows removes both Lemon-generated and
+#	Flex-generated files, as the Flex-generated files in the
+#	distribution were generated by Flex on UN*X, and won't compile
+#	on Windows;
+#
+#	Flex-generated files can't be built with full warnings
+#	turned on, and can't be run through the checkAPI scripts,
+#	as they generate code that won't pass (we've tweaked
+#	Lemon to generate code that will pass).
 #
 
 #
-# All distributed generated dissector source files.
+# All Flex-generated dissector source files.
 #
-GENERATED_DISSECTOR_SRC_FILES = \
-	$(GENERATED_DISSECTOR_C_FILES) \
-	$(GENERATED_DISSECTOR_CPP_FILES)
+FLEX_GENERATED_DISSECTOR_SRC_FILES = \
+	$(FLEX_GENERATED_DISSECTOR_C_FILES) \
+	$(FLEX_GENERATED_DISSECTOR_CPP_FILES)
 
 #
-# All distributed generated non-dissector source files.
+# All Flex-generated non-dissector source files.
 #
-GENERATED_SUPPORT_SRC_FILES = \
-	$(GENERATED_SUPPORT_C_FILES) \
-	$(GENERATED_SUPPORT_CPP_FILES)
+FLEX_GENERATED_SUPPORT_SRC_FILES = \
+	$(FLEX_GENERATED_SUPPORT_C_FILES) \
+	$(FLEX_GENERATED_SUPPORT_CPP_FILES)
 
 #
-# All distributed generated source files.
+# All Flex-generated source files.
 #
-GENERATED_SRC_FILES = \
-	$(GENERATED_DISSECTOR_SRC_FILES) \
-	$(GENERATED_SUPPORT_SRC_FILES)
+FLEX_GENERATED_SRC_FILES = \
+	$(FLEX_GENERATED_DISSECTOR_SRC_FILES) \
+	$(FLEX_GENERATED_SUPPORT_SRC_FILES)
 
 #
-# All non-distributed generated dissector source files.
+# All Lemon-generated dissector source files.
 #
-NODIST_GENERATED_DISSECTOR_SRC_FILES = \
-	$(NODIST_GENERATED_DISSECTOR_C_FILES) \
-	$(NODIST_GENERATED_DISSECTOR_CPP_FILES)
+LEMON_GENERATED_DISSECTOR_SRC_FILES = \
+	$(LEMON_GENERATED_DISSECTOR_C_FILES) \
+	$(LEMON_GENERATED_DISSECTOR_CPP_FILES)
 
 #
-# All non-distributed generated non-dissector source files.
+# All Lemon-generated non-dissector source files.
 #
-NODIST_GENERATED_SUPPORT_SRC_FILES = \
-	$(NODIST_GENERATED_SUPPORT_C_FILES) \
-	$(NODIST_GENERATED_SUPPORT_CPP_FILES)
+LEMON_GENERATED_SUPPORT_SRC_FILES = \
+	$(LEMON_GENERATED_SUPPORT_C_FILES) \
+	$(LEMON_GENERATED_SUPPORT_CPP_FILES)
 
 #
-# All non-distributed generated source files.
+# All Lemon-generated source files.
 #
-NODIST_GENERATED_SRC_FILES = \
-	$(NODIST_GENERATED_DISSECTOR_SRC_FILES) \
-	$(NODIST_GENERATED_SUPPORT_SRC_FILES)
+LEMON_GENERATED_SRC_FILES = \
+	$(LEMON_GENERATED_DISSECTOR_SRC_FILES) \
+	$(LEMON_GENERATED_SUPPORT_SRC_FILES)
 
 #
-# All distributed dissector source files.
+# All non-generated dissector source files.
 #
 DISSECTOR_SRC_FILES = \
 	$(DISSECTOR_C_FILES) \
 	$(DISSECTOR_CPP_FILES)
 
 #
-# All distributed non-dissector source files.
+# All generated dissector source files.
 #
-SUPPORT_SRC_FILES = \
-	$(SUPPORT_C_FILES) \
-	$(SUPPORT_CPP_FILES)
+GENERATED_DISSECTOR_SRC_FILES = \
+	$(FLEX_GENERATED_DISSECTOR_SRC_FILES) \
+	$(LEMON_GENERATED_DISSECTOR_SRC_FILES)
 
 #
-# All non-distributed non-dissector source files.
+# All non-generated non-dissector source files.
 #
-NODIST_SUPPORT_SRC_FILES = \
-	$(NODIST_SUPPORT_C_FILES) \
-	$(NODIST_SUPPORT_CPP_FILES)
+SUPPORT_SRC_FILES = \
+	$(SUPPORT_C_FILES) \
+	$(SUPPORT_CPP_FILES)
 
 #
 # All distributed source files.
 #
 SRC_FILES = \
 	$(DISSECTOR_SRC_FILES) \
-	$(SUPPORT_SRC_FILES)
+	$(SUPPORT_SRC_FILES) \
+	$(FLEX_GENERATED_SRC_FILES)
 
 #
 # All non-distributed source files.
 #
 NODIST_SRC_FILES = \
-	$(NODIST_DISSECTOR_SRC_FILES) \
-	$(NODIST_SUPPORT_SRC_FILES)
+	$(LEMON_GENERATED_SRC_FILES)
+
+#
+# All generated source files.
+#
+GENERATED_SRC_FILES = \
+	$(FLEX_GENERATED_SRC_FILES) \
+	$(LEMON_GENERATED_SRC_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.
+#
+CLEAN_SRC_FILES = \
+	$(DISSECTOR_SRC_FILES) \
+	$(LEMON_GENERATED_SRC_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)
+