diff options
| author | Guy Harris <guy@alum.mit.edu> | 2007-12-07 23:38:59 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2007-12-07 23:38:59 +0000 |
| commit | 8b14380c28190360662634b96946c3a0b9c263f8 (patch) | |
| tree | eb5abb6c8ff2ca1adf71f6904267634a95c33ab1 /wiretap | |
| parent | c45d93e698e6217fd8eeb647e1ce6dc59f13e16e (diff) | |
| download | wireshark-8b14380c28190360662634b96946c3a0b9c263f8.tar.gz | |
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.
svn path=/trunk/; revision=23797
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/Makefile.am | 9 | ||||
| -rw-r--r-- | wiretap/Makefile.nmake | 9 |
2 files changed, 3 insertions, 15 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 diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake index e7f6738ed1..78e16f0e37 100644 --- a/wiretap/Makefile.nmake +++ b/wiretap/Makefile.nmake @@ -38,8 +38,6 @@ wiretap-$(WTAP_VERSION).dll : $(OBJECTS) wtap.def ..\image\wiretap.res mt.exe -nologo -manifest "wiretap-$(WTAP_VERSION).dll.manifest" -outputresource:wiretap-$(WTAP_VERSION).dll;2 !ENDIF -$(OBJECTS): config.h - RUNLEX = ..\tools\runlex.sh ascend-scanner_lex.h : ascend-scanner.c @@ -51,11 +49,6 @@ k12text.obj : k12text.c ascend-grammar.c ascend-grammar.h : ascend-grammar.y $(YACC) $(YACC_OPTS) -d -p ascend ascend-grammar.y -o ascend-grammar.c -config.h : config.h.win32 ..\config.nmake - sed -e s/@VERSION@/$(WTAP_VERSION)/ \ - -e "s/@HAVE_LIBZ@/$(ZLIB_CONFIG)/" \ - < config.h.win32 > $@ - clean : rm -f $(OBJECTS) \ wiretap-*.lib \ @@ -74,6 +67,6 @@ clean : # long as you need Flex, you might as well get Bison.... # distclean: clean - rm -f config.h $(GENERATED_FILES) + rm -f $(GENERATED_FILES) maintainer-clean: distclean |