Split libui into libui and libui_dirty. The latter contains (only)

text_import_scanner.c (which is generated and not by us so we can't guarantee
that it's clean).

svn path=/trunk/; revision=34912

Makefile.am

@@ -310,6 +310,7 @@ endif
 # applications are X applications).
 wireshark_LDADD = \
 	gtk/libui.a			\
+	gtk/libui_dirty.a		\
 	codecs/libcodec.a		\
 	wiretap/libwiretap.la		\
 	epan/libwireshark.la		\

gtk/Makefile.am

@@ -25,13 +25,14 @@ include Makefile.common
 include ../Makefile.am.inc
 
 if HAVE_WARNINGS_AS_ERRORS
-AM_CFLAGS = -Werror
+AM_CLEAN_CFLAGS = -Werror
 endif
 
-noinst_LIBRARIES = libui.a
+noinst_LIBRARIES = libui.a libui_dirty.a
 
 CLEANFILES = \
 	libui.a		\
+	libui_dirty.a	\
 	*~
 
 MAINTAINERCLEANFILES = \
@@ -50,8 +51,16 @@ libui_a_SOURCES = \
 	$(noinst_HEADERS) \
 	$(WIRESHARK_TAP_SRC)
 
+libui_a_CFLAGS = $(AM_CLEAN_CFLAGS)
+
 libui_a_DEPENDENCIES =
 
+
+libui_dirty_a_SOURCES = \
+	$(DIRTY_GENERATED_C_FILES)
+
+libui_dirty_a_DEPENDENCIES =
+
 # Common headers
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES)
 

gtk/Makefile.common

@@ -29,7 +29,9 @@ GENERATED_HEADER_FILES = \
 
 # Generated C source files that we want in the distribution.
 GENERATED_C_FILES = \
-	wireshark-tap-register.c	\
+	wireshark-tap-register.c
+
+DIRTY_GENERATED_C_FILES = \
 	text_import_scanner.c
 
 # All the generated files we want in the distribution.

gtk/Makefile.nmake

@@ -31,6 +31,7 @@ include Makefile.common
 WIRESHARK_WIN32_GTK_SRC = \
 	$(WIRESHARK_GTK_SRC) \
 	$(GENERATED_C_FILES) \
+	$(DIRTY_GENERATED_C_FILES) \
 	capture_if_details_dlg_win32.c	\
 	file_dlg_win32.c \
 	print_win32.c \