diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-02-17 00:10:43 -0800 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2018-02-17 14:47:23 +0000 |
| commit | 6be0444caf472125fd765107be5b04c6c50dc928 (patch) | |
| tree | 67f89ad5441f395638d89cab80c4dc780b0ce073 /epan/dfilter | |
| parent | 49e331c4cec96a1ca2637eed48f67553bc53a5b9 (diff) | |
Don't make separate libXXX_generated libraries.
We no longer use different compiler flags for generated and
non-generated files, so we don't need to put them into separate
libraries and then add the files from the generated library into the
main library.
Change-Id: Idbd35510ccb8c9107b4de4199c8b1bcaa6f7a060
Reviewed-on: https://code.wireshark.org/review/25831
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dfilter')
| -rw-r--r-- | epan/dfilter/Makefile.am | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am index 4afe4da7d2..427ab95b24 100644 --- a/epan/dfilter/Makefile.am +++ b/epan/dfilter/Makefile.am @@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.am.inc AM_CPPFLAGS = $(INCLUDEDIRS) -I$(top_srcdir)/epan -I$(lemon_srcdir) \ $(WS_CPPFLAGS) $(GLIB_CFLAGS) -noinst_LTLIBRARIES = libdfilter_generated.la libdfilter.la +noinst_LTLIBRARIES = libdfilter.la # C source files that are part of the display filter source; this includes only # .c files, not YACC or Lex or... files (as Makefile.nmake maps this list @@ -101,28 +101,13 @@ subpkgincludedir = $(pkgincludedir)/epan/dfilter subpkginclude_HEADERS = $(NONGENERATED_HEADERS_PUBLIC) - -#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 -#"stop on warning". An other library is generated from the remaining source -#files with the "stop on warning" barrier. libdfilter_la_SOURCES = \ $(NONGENERATED_C_FILES) \ - $(NONGENERATED_HEADERS_PRIVATE) - -libdfilter_la_LIBADD = \ - libdfilter_generated.la - -libdfilter_la_DEPENDENCIES = \ - libdfilter_generated.la - -libdfilter_generated_la_SOURCES = \ + $(NONGENERATED_HEADERS_PRIVATE) \ $(GENERATED_C_FILES) \ $(GENERATED_HEADER_FILES) -libdfilter_generated_la_CFLAGS = $(AM_CFLAGS) - -nodist_libdfilter_generated_la_SOURCES = \ +nodist_libdfilter_la_SOURCES = \ $(NODIST_GENERATED_C_FILES) \ $(NODIST_GENERATED_HEADER_FILES) @@ -138,8 +123,7 @@ DISTCLEANFILES = \ MAINTAINERCLEANFILES = \ $(GENERATED_FILES) -BUILT_SOURCES = \ - grammar.h +BUILT_SOURCES = $(GENERATED_HEADER_FILES) $(NODIST_GENERATED_HEADER_FILES) scanner_lex.h : scanner.c |