diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-11-10 22:23:47 +0000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-11-11 19:13:03 +0000 |
| commit | b032b338010830fd9994a5530f743dbd3112a3ae (patch) | |
| tree | dafb9a1681f0f2ccf8715f487439009989053d83 | |
| parent | fa6dc7b3fb60e38869f01c73fc240a07a7db1eda (diff) | |
autotools: rename libui_dirty to libui_generated
Change-Id: I382fbc2af5c42772e4feb65f33ea2a326b9b5c62
Reviewed-on: https://code.wireshark.org/review/24351
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | ui/Makefile.am | 20 |
2 files changed, 8 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index e6ed5ebc05..187212fab1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -433,7 +433,7 @@ wireshark_common_ldadd = \ capchild/libcapchild.a \ caputils/libcaputils.a \ ui/libui.a \ - ui/libui_dirty.a \ + ui/libui_generated.a \ codecs/libwscodecs.la \ wiretap/libwiretap.la \ epan/libwireshark.la \ diff --git a/ui/Makefile.am b/ui/Makefile.am index 3232d53e36..1235c47e62 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -25,23 +25,20 @@ include $(top_srcdir)/Makefile.am.inc AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DDOC_DIR=\"$(docdir)\" \ $(GLIB_CFLAGS) $(PCAP_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) -noinst_LIBRARIES = libui.a libui_dirty.a +noinst_LIBRARIES = libui.a libui_generated.a # Generated header files that we want in the distribution. GENERATED_HEADER_FILES = \ text_import_scanner_lex.h # Generated C source files that we want in the distribution. -GENERATED_C_FILES = - -DIRTY_GENERATED_C_FILES = \ +GENERATED_C_FILES = \ text_import_scanner.c # All the generated files we want in the distribution. GENERATED_FILES = \ $(GENERATED_HEADER_FILES) \ - $(GENERATED_C_FILES) \ - $(DIRTY_GENERATED_C_FILES) + $(GENERATED_C_FILES) # Files that generate compileable files GENERATOR_FILES = \ @@ -147,14 +144,11 @@ WIRESHARK_UI_INCLUDES = \ # All sources that should be put in the source distribution tarball libui_a_SOURCES = \ $(WIRESHARK_UI_SRC) \ - $(WIRESHARK_UI_INCLUDES) \ - $(GENERATED_HEADER_FILES) \ - $(GENERATED_C_FILES) + $(WIRESHARK_UI_INCLUDES) -libui_dirty_a_SOURCES = \ - $(DIRTY_GENERATED_C_FILES) +libui_generated_a_SOURCES = $(GENERATED_FILES) -libui_dirty_a_CFLAGS = $(GENERATED_CFLAGS) +libui_generated_a_CFLAGS = $(GENERATED_CFLAGS) EXTRA_DIST = \ .editorconfig \ @@ -176,7 +170,7 @@ libui_a_CFLAGS = $(AM_CFLAGS) $(PIE_CFLAGS) CLEANFILES = \ doxygen-ui.tag \ libui.a \ - libui_dirty.a \ + libui_generated.a \ *~ MAINTAINERCLEANFILES = \ |