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/Makefile.common | |
| parent | 7f398a97af4a4b446fcb034089307d1415ff419f (diff) | |
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/Makefile.common')
| -rw-r--r-- | epan/Makefile.common | 42 |
1 files changed, 15 insertions, 27 deletions
diff --git a/epan/Makefile.common b/epan/Makefile.common index 9eaf49f9ae..e9ef6d4df1 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -97,12 +97,15 @@ LIBWIRESHARK_SRC = \ xdlc.c # -# These get removed on "make distclean", as the tools we use to generate -# them are part of the Wireshark distribution. +# We distribute Lemon with Wireshark, so we don't distribute the files +# it produces. # -LIBWIRESHARK_DISTCLEAN_GENERATED_SRC = \ +LIBWIRESHARK_GENERATED_NODIST_C_FILES = \ dtd_grammar.c +LIBWIRESHARK_GENERATED_NODIST_HEADER_FILES = \ + dtd_grammar.h + # # These don't get removed on "make distclean", as the tools we use to # generate them aren't part of the Wireshark distribution, and aren't @@ -110,16 +113,23 @@ LIBWIRESHARK_DISTCLEAN_GENERATED_SRC = \ # from a tarball (e.g., make and a C compiler are assumed to be present, # but Flex isn't). # -LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC = \ +LIBWIRESHARK_GENERATED_C_FILES = \ diam_dict.c \ dtd_parse.c \ dtd_preparse.c \ radius_dict.c \ uat_load.c +LIBWIRESHARK_GENERATED_HEADER_FILES = \ + diam_dict_lex.h \ + dtd_parse_lex.h \ + dtd_preparse_lex.h \ + radius_dict_lex.h \ + uat_load_lex.h + LIBWIRESHARK_GENERATED_SRC = \ $(LIBWIRESHARK_DISTCLEAN_GENERATED_SRC) \ - $(LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC) + $(LIBWIRESHARK_GENERATED_C_FILES) LIBWIRESHARK_ALL_SRC = \ $(LIBWIRESHARK_SRC) \ @@ -237,25 +247,3 @@ LIBWIRESHARK_INCLUDES = \ value_string.h \ x264_prt_id.h \ xdlc.h - -# -# As with LIBWIRESHARK_DISTCLEAN_GENERATED_SRC, so with -# LIBWIRESHARK_DISTCLEAN_GENERATED_INCLUDES. -# -LIBWIRESHARK_DISTCLEAN_GENERATED_INCLUDES = \ - dtd_grammar.h - -# -# As with LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC, so with -# LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES. -# -LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES = \ - diam_dict_lex.h \ - dtd_parse_lex.h \ - dtd_preparse_lex.h \ - radius_dict_lex.h \ - uat_load_lex.h - -LIBWIRESHARK_GENERATED_INCLUDES = \ - $(LIBWIRESHARK_DISTCLEAN_GENERATED_INCLUDES) \ - $(LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES) |