diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-20 13:25:21 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-20 20:25:59 +0000 |
| commit | 64ec2b2e5ed590a6f1a3d22c8b24a6e70420d1f9 (patch) | |
| tree | aab752fe44790898535c850d89e015b75b569149 /Makefile.am | |
| parent | 2e6cb9dbab154531b306e472642ff6033f0e341c (diff) | |
Take the error message generation out of the merge_files routines.
Have them just return the information needed for the caller to produce
an error message, and have the callers use the new cfile_ routines for
reporting errors.
This requires that the "write failure alert box" routine take the
*input* file name as an argument, so that, on a merge, if the problem is
that a record from a given input file can't be written out to the type
of output file we're generating, the input file name can be given, along
with the record number in that file.
Change-Id: If5a5e00539e7e652008a523dec92c0b359a48e71
Reviewed-on: https://code.wireshark.org/review/21257
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index aa0c626c72..83f2e5ce6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -630,6 +630,7 @@ mergecap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) # Libraries with which to link mergecap. mergecap_LDADD = \ + ui/libui.a \ wiretap/libwiretap.la \ wsutil/libwsutil.la \ @GLIB_LIBS@ |