diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-02-05 06:09:17 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-02-05 06:09:17 +0000 |
| commit | 9eba2ea90a3970308a4f049107f2830ed23c3262 (patch) | |
| tree | 0cb1e36e1fbffe0a8b606337ec51c0068546b5f3 /epan/dfilter | |
| parent | 7f398a97af4a4b446fcb034089307d1415ff419f (diff) | |
| download | wireshark-9eba2ea90a3970308a4f049107f2830ed23c3262.tar.gz | |
Don't distribute the results of running Lemon, as we distribute Lemon
ourselves.
Clean up various bits of "distribute" vs. "don't distribute" stuff in
the process - use similar names, and make the "distribute vs. don't
distribute" distinction the same as the "don't clean with "make
distclean" vs. clean with "make distclean"" distinction.
svn path=/trunk/; revision=47485
Diffstat (limited to 'epan/dfilter')
| -rw-r--r-- | epan/dfilter/Makefile.am | 13 | ||||
| -rw-r--r-- | epan/dfilter/Makefile.common | 25 |
2 files changed, 27 insertions, 11 deletions
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am index bdf01097c4..cbdb7b6f9c 100644 --- a/epan/dfilter/Makefile.am +++ b/epan/dfilter/Makefile.am @@ -40,13 +40,12 @@ CLEANFILES = \ DISTCLEANFILES = \ grammar.out \ - grammar.c \ - grammar.h + $(GENERATED_NODIST_FILES) MAINTAINERCLEANFILES = \ - Makefile.in \ - scanner.c \ - scanner_lex.h + $(GENERATED_FILES) \ + $(GENERATED_NODIST_FILES) \ + Makefile.in INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/$(LEMON) @@ -61,6 +60,10 @@ libdfilter_generated_la_SOURCES = \ $(GENERATED_C_FILES) \ $(GENERATED_HEADER_FILES) +nodist_libdfilter_generated_la_SOURCES = \ + $(GENERATED_NODIST_C_FILES) \ + $(GENERATED_NODIST_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 b19d69ca83..bd571af98b 100644 --- a/epan/dfilter/Makefile.common +++ b/epan/dfilter/Makefile.common @@ -64,15 +64,28 @@ GENERATOR_FILES = \ grammar.lemon \ scanner.l -# The C source files they generate. +# The C source files they generate and that we want in the distribution GENERATED_C_FILES = \ - grammar.c \ scanner.c -# The header files that they generate. +# The C source files they generate and that we don't want in the distribution +GENERATED_NODIST_C_FILES = \ + grammar.c + +# The header files that they generate and that we want in the distribution GENERATED_HEADER_FILES = \ - grammar.h \ scanner_lex.h -# All the generated files. -GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES) +# The header files that they generate and that we don't want in the distribution +GENERATED_NODIST_HEADER_FILES = \ + grammar.h + +# All the generated files we want in the distribution. +GENERATED_FILES = \ + $(GENERATED_C_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) |