Put NODIST_ at the beginning of macro names, as was done for the plugins

directory.

svn path=/trunk/; revision=47599

8 files changed, 33 insertions, 33 deletions

diff --git a/epan/Makefile.am b/epan/Makefile.am
index b196b61455..a126b9af7c 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -83,8 +83,8 @@ libwireshark_generated_la_SOURCES = \
 	$(LIBWIRESHARK_GENERATED_HEADER_FILES)
 
 nodist_libwireshark_generated_la_SOURCES = \
-	$(LIBWIRESHARK_GENERATED_NODIST_C_FILES) \
-	$(LIBWIRESHARK_GENERATED_NODIST_HEADER_FILES)
+	$(NODIST_LIBWIRESHARK_GENERATED_C_FILES) \
+	$(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES)
 
 # code optionally implemented in assembler
 # only C source available for platforms other than Win32
@@ -123,8 +123,8 @@ CLEANFILES = \
 	*~
 
 DISTCLEANFILES = \
-	$(LIBWIRESHARK_GENERATED_NODIST_C_FILES) \
-	$(LIBWIRESHARK_GENERATED_NODIST_HEADER_FILES) \
+	$(NODIST_LIBWIRESHARK_GENERATED_C_FILES) \
+	$(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \
 	dtd_grammar.out
 
 MAINTAINERCLEANFILES = \
diff --git a/epan/Makefile.common b/epan/Makefile.common
index 04a0059988..67bc2e5201 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -100,10 +100,10 @@ LIBWIRESHARK_SRC = 		\
 # We distribute Lemon with Wireshark, so we don't distribute the files
 # it produces.
 #
-LIBWIRESHARK_GENERATED_NODIST_C_FILES = \
+NODIST_LIBWIRESHARK_GENERATED_C_FILES = \
 	dtd_grammar.c
 
-LIBWIRESHARK_GENERATED_NODIST_HEADER_FILES = \
+NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES = \
 	dtd_grammar.h
 
 #
@@ -129,7 +129,7 @@ LIBWIRESHARK_GENERATED_HEADER_FILES = \
 
 LIBWIRESHARK_GENERATED_SRC = 	\
 	$(LIBWIRESHARK_GENERATED_C_FILES) \
-	$(LIBWIRESHARK_GENERATED_NODIST_C_FILES)
+	$(NODIST_LIBWIRESHARK_GENERATED_C_FILES)
 
 LIBWIRESHARK_ALL_SRC = \
 	$(LIBWIRESHARK_SRC) 	\
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 3ceaad3740..8e564b7a4e 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -142,8 +142,8 @@ clean:  clean-local
 #
 distclean-local: clean-local
 	rm -f config.h register.c mkstemp.c \
-		$(LIBWIRESHARK_GENERATED_NODIST_C_FILES) \
-		$(LIBWIRESHARK_GENERATED_NODIST_HEADER_FILES) \
+		$(NODIST_LIBWIRESHARK_GENERATED_C_FILES) \
+		$(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \
 		$(LIBWIRESHARK_GENERATED_C_FILES) \
 		$(LIBWIRESHARK_GENERATED_HEADER_FILES) \
 		dtd_grammar.out	sminmpec.c
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index cbdb7b6f9c..3cc0d8a9e9 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -40,11 +40,11 @@ CLEANFILES = \
 
 DISTCLEANFILES = \
 	grammar.out	\
-	$(GENERATED_NODIST_FILES)
+	$(NODIST_GENERATED_FILES)
 
 MAINTAINERCLEANFILES = \
 	$(GENERATED_FILES)	\
-	$(GENERATED_NODIST_FILES)	\
+	$(NODIST_GENERATED_FILES)	\
 	Makefile.in
 
 INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/$(LEMON)
@@ -61,8 +61,8 @@ libdfilter_generated_la_SOURCES = \
 	$(GENERATED_HEADER_FILES)
 
 nodist_libdfilter_generated_la_SOURCES = \
-	$(GENERATED_NODIST_C_FILES)	\
-	$(GENERATED_NODIST_HEADER_FILES)
+	$(NODIST_GENERATED_C_FILES)	\
+	$(NODIST_GENERATED_HEADER_FILES)
 
 libdfilter_la_LIBADD = libdfilter_generated.la
 libdfilter_la_DEPENDENCIES = libdfilter_generated.la
diff --git a/epan/dfilter/Makefile.common b/epan/dfilter/Makefile.common
index bd571af98b..4b139dc41a 100644
--- a/epan/dfilter/Makefile.common
+++ b/epan/dfilter/Makefile.common
@@ -69,7 +69,7 @@ GENERATED_C_FILES = \
 	scanner.c
 
 # The C source files they generate and that we don't want in the distribution
-GENERATED_NODIST_C_FILES = \
+NODIST_GENERATED_C_FILES = \
 	grammar.c
 
 # The header files that they generate and that we want in the distribution
@@ -77,7 +77,7 @@ GENERATED_HEADER_FILES = \
 	scanner_lex.h
 
 # The header files that they generate and that we don't want in the distribution
-GENERATED_NODIST_HEADER_FILES = \
+NODIST_GENERATED_HEADER_FILES = \
 	grammar.h
 
 # All the generated files we want in the distribution.
@@ -86,6 +86,6 @@ GENERATED_FILES = \
 	$(GENERATED_HEADER_FILES)
 
 # All the generated files we don't want in the distribution.
-GENERATED_NODIST_FILES = \
-	$(GENERATED_NODIST_C_FILES) \
-	$(GENERATED_NODIST_HEADER_FILES)
+NODIST_GENERATED_FILES = \
+	$(NODIST_GENERATED_C_FILES) \
+	$(NODIST_GENERATED_HEADER_FILES)
diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index 3bfe04b2f1..3ad6e5aa49 100644
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -25,7 +25,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
 OBJECTS=\
 	$(NONGENERATED_C_FILES:.c=.obj) \
 	$(GENERATED_C_FILES:.c=.obj) \
-	$(GENERATED_NODIST_C_FILES:.c=.obj)
+	$(NODIST_GENERATED_C_FILES:.c=.obj)
 
 dfilter.lib	: $(OBJECTS)
 	link /lib /out:dfilter.lib $(OBJECTS)
@@ -51,9 +51,9 @@ clean:
 #
 distclean: clean
 	rm -f $(GENERATED_C_FILES) \
-		$(GENERATED_NODIST_C_FILES) \
+		$(NODIST_GENERATED_C_FILES) \
 		$(GENERATED_HEADER_FILES) \
-		$(GENERATED_NODIST_HEADER_FILES) \
+		$(NODIST_GENERATED_HEADER_FILES) \
 		grammar.out
 
 maintainer-clean: distclean
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index cbc349f31b..c6ff4f8eb3 100644
--- a/ui/qt/Makefile.am
+++ b/ui/qt/Makefile.am
@@ -35,11 +35,11 @@ CLEANFILES = \
 	*~
 
 DISTCLEANFILES = \
-	$(GENERATED_NODIST_FILES)
+	$(NODIST_GENERATED_FILES)
 
 MAINTAINERCLEANFILES = \
 	$(GENERATED_FILES)		\
-	$(GENERATED_NODIST_FILES)	\
+	$(NODIST_GENERATED_FILES)	\
 	Makefile.in
 
 RUNLEX=$(top_srcdir)/tools/runlex.sh
@@ -53,9 +53,9 @@ libqtui_a_SOURCES = \
 	$(GENERATED_HEADER_FILES)
 
 nodist_libqtui_a_SOURCES = \
-	$(GENERATED_NODIST_C_FILES) \
-	$(GENERATED_NODIST_CPP_FILES) \
-	$(GENERATED_NODIST_HEADER_FILES)
+	$(NODIST_GENERATED_C_FILES) \
+	$(NODIST_GENERATED_CPP_FILES) \
+	$(NODIST_GENERATED_HEADER_FILES)
 
 libqtui_a_CFLAGS = $(AM_CLEAN_CFLAGS)
 
diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common
index 49b5e20f3f..283229bc04 100644
--- a/ui/qt/Makefile.common
+++ b/ui/qt/Makefile.common
@@ -30,7 +30,7 @@ include Makefile_custom.common
 GENERATED_HEADER_FILES =
 
 # Generated header files that we don't want in the distribution.
-GENERATED_NODIST_HEADER_FILES = \
+NODIST_GENERATED_HEADER_FILES = \
 	ui_capture_preferences_frame.h \
 	ui_column_preferences_frame.h \
 	ui_export_object_dialog.h \
@@ -57,13 +57,13 @@ GENERATED_NODIST_HEADER_FILES = \
 GENERATED_C_FILES =
 
 # Generated C source files that we don't want in the distribution.
-GENERATED_NODIST_C_FILES =
+NODIST_GENERATED_C_FILES =
 
 # Generated C++ source files that we want in the distribution.
 GENERATED_CPP_FILES =
 
 # Generated C++ source files that we don't want in the distribution.
-GENERATED_NODIST_CPP_FILES = \
+NODIST_GENERATED_CPP_FILES = \
 	$(MOC_SRC) \
 	$(QRC_SRC)
 
@@ -74,10 +74,10 @@ GENERATED_FILES = \
 	$(GENERATED_CPP_FILES)
 
 # All the generated files we don't want in the distribution.
-GENERATED_NODIST_FILES = \
-	$(GENERATED_NODIST_HEADER_FILES) \
-	$(GENERATED_NODIST_C_FILES) \
-	$(GENERATED_NODIST_CPP_FILES)
+NODIST_GENERATED_FILES = \
+	$(NODIST_GENERATED_HEADER_FILES) \
+	$(NODIST_GENERATED_C_FILES) \
+	$(NODIST_GENERATED_CPP_FILES)
 
 # Files that generate compileable files
 GENERATOR_FILES =