diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-06-18 10:01:59 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-06-18 10:01:59 +0000 |
| commit | a43f7d1f88d469b0063769511f214d097a390e52 (patch) | |
| tree | c7462e463a211355f06450bab8748eaf738fa869 /Makefile.common | |
| parent | fa46f7a6db760d5cd48599f13d6dfaceeb8a04fa (diff) | |
merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),
and doing some more code cleanup
svn path=/trunk/; revision=11176
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common index 89957a6f69..9ed2aa20f4 100644 --- a/Makefile.common +++ b/Makefile.common @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common,v 1.47 2004/06/17 21:53:24 ulfl Exp $ +# $Id: Makefile.common,v 1.48 2004/06/18 10:01:59 ulfl Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -348,6 +348,7 @@ ethereal_INCLUDES = \ g711.h \ globals.h \ menu.h \ + merge.h \ progress_dlg.h \ proto_hier_stats.h \ simple_dialog.h \ @@ -371,6 +372,7 @@ text2pcap_SOURCES = \ # mergecap specifics mergecap_SOURCES = \ mergecap.c \ + merge.c \ cvsversion.h # editcap specifics |