diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-12-07 23:38:59 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-12-07 23:38:59 +0000 |
commit | 05a2092adc9391baa4c856e6bcc8cd024550edef (patch) | |
tree | eb5abb6c8ff2ca1adf71f6904267634a95c33ab1 /wiretap/Makefile.am | |
parent | a1d09272a1ea5a7fb26787f5413dca7051a49895 (diff) |
Run runlex.sh from the tools directory. Get rid of the extra copy in
the top-level directory.
Don't build config.h in the wiretap directory - it now uses config.h
from the top-level directory. Get rid of the template config.h.win32 in
that directory.
Get rid of files that are no longer in the wiretap directory or are no
longer constructed in that directory.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23797 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap/Makefile.am')
-rw-r--r-- | wiretap/Makefile.am | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 570fcf1383..22bbb78d41 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -44,10 +44,7 @@ CLEANFILES = \ MAINTAINERCLEANFILES = \ $(GENERATED_FILES) \ - Makefile.in \ - aclocal.m4 \ - config.h.in \ - configure + Makefile.in #Since code generated by lex may trigger gcc warnings, we are now generating two #libraries. A single library is generated with the lex code without the barrier @@ -63,10 +60,8 @@ libwiretap_generated_la_SOURCES = \ EXTRA_DIST = \ README.developer \ - config.h.win32 \ Makefile.common \ Makefile.nmake \ - runlex.sh \ wtap.def \ file_util.c \ $(GENERATOR_SOURCES) \ @@ -75,7 +70,7 @@ EXTRA_DIST = \ libwiretap_la_LIBADD = libwiretap_generated.la libwiretap_la_DEPENDENCIES = libwiretap_generated.la -RUNLEX = $(top_srcdir)/runlex.sh +RUNLEX = $(top_srcdir)/tools/runlex.sh ascend-scanner_lex.h : ascend-scanner.c |