Allow the Gtk+ and Qt versions to be built simultaneously (with autotools).
[metze/wireshark/wip.git] / Makefile.common
index 4028e57605c1054abb3e6bf1204840187ff04900..635e8c4ff05e638458835820661e384f00fe1e4c 100644 (file)
@@ -21,7 +21,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # "BUILT_SOURCES" are built before any "make all" or "make check" targets.
 BUILT_HEADER_FILES =   \
@@ -38,17 +38,17 @@ GENERATED_HEADER_FILES = \
 
 # C source files generated from source files.
 GENERATED_C_FILES = \
-       $(BUILT_C_FILES)        \
-       tshark-tap-register.c
+       $(BUILT_C_FILES)
 
 # All the generated files.
 GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
 
 # sources common for wireshark, tshark, and rawshark
-WIRESHARK_COMMON_SRC = \
+SHARK_COMMON_SRC =     \
        $(PLATFORM_SRC)         \
        capture-pcap-util.c     \
        cfile.c                 \
+       cfutils.c               \
        clopts_common.c         \
        disabled_protos.c       \
        frame_data_sequence.c   \
@@ -62,14 +62,14 @@ WIRESHARK_COMMON_SRC =      \
        version_info.c
 
 # corresponding headers
-WIRESHARK_COMMON_INCLUDES =    \
+SHARK_COMMON_INCLUDES =        \
        svnversion.h            \
        capture-pcap-util.h     \
        capture-pcap-util-int.h \
        cfile.h                 \
-       clopts_common.hs        \
+       cfutils.h               \
+       clopts_common.h         \
        cmdarg_err.h            \
-       console_io.h            \
        color.h                 \
        disabled_protos.h       \
        file.h                  \
@@ -84,8 +84,8 @@ WIRESHARK_COMMON_INCLUDES =   \
        timestats.h             \
        tap-megaco-common.h     \
        tap-rtp-common.h        \
-       ui/util.h               \
-       version_info.h
+       version_info.h          \
+       ws_symbol_export.h
 
 # sources common for wireshark and tshark, but not rawshark;
 # these are for programs that capture traffic by running dumpcap
@@ -97,122 +97,75 @@ SHARK_COMMON_CAPTURE_SRC = \
 # corresponding headers
 SHARK_COMMON_CAPTURE_INCLUDES =        \
        capture_ifinfo.h        \
+       capture_session.h       \
        capture_sync.h          \
        capture_ui_utils.h
 
-# sources for TShark taps
-TSHARK_TAP_SRC =       \
-       ui/cli/tap-afpstat.c    \
-       ui/cli/tap-ansi_astat.c \
-       ui/cli/tap-bootpstat.c  \
-       ui/cli/tap-camelcounter.c       \
-       ui/cli/tap-camelsrt.c   \
-       ui/cli/tap-comparestat.c        \
-       ui/cli/tap-dcerpcstat.c \
-       ui/cli/tap-diameter-avp.c \
-       ui/cli/tap-expert.c     \
-       ui/cli/tap-follow.c     \
-       ui/cli/tap-funnel.c     \
-       ui/cli/tap-gsm_astat.c  \
-       ui/cli/tap-h225counter.c        \
-       ui/cli/tap-h225rassrt.c \
-       ui/cli/tap-hosts.c      \
-       ui/cli/tap-httpstat.c   \
-       ui/cli/tap-icmpstat.c   \
-       ui/cli/tap-icmpv6stat.c \
-       ui/cli/tap-iostat.c     \
-       ui/cli/tap-iousers.c    \
-       ui/cli/tap-macltestat.c \
-       ui/cli/tap-mgcpstat.c   \
-       ui/cli/tap-megacostat.c \
-       ui/cli/tap-protocolinfo.c       \
-       ui/cli/tap-protohierstat.c      \
-       ui/cli/tap-radiusstat.c \
-       ui/cli/tap-rlcltestat.c \
-       ui/cli/tap-rpcstat.c    \
-       ui/cli/tap-rpcprogs.c   \
-       ui/cli/tap-rtp.c        \
-       ui/cli/tap-rtspstat.c   \
-       ui/cli/tap-scsistat.c   \
-       ui/cli/tap-sctpchunkstat.c      \
-       ui/cli/tap-sipstat.c    \
-       ui/cli/tap-smbsids.c    \
-       ui/cli/tap-smbstat.c    \
-       ui/cli/tap-stats_tree.c \
-       ui/cli/tap-sv.c         \
-       ui/cli/tap-wspstat.c
-
 # wireshark specifics
-wireshark_SOURCES =    \
-       $(WIRESHARK_COMMON_SRC) \
+WIRESHARK_COMMON_SRC = \
+       $(SHARK_COMMON_SRC)     \
        $(SHARK_COMMON_CAPTURE_SRC) \
        airpcap_loader.c \
-       alert_box.c     \
        capture.c       \
        capture_info.c  \
-       capture_opts.c \
+       capture_opts.c  \
        color_filters.c \
-       file.c  \
+       file.c          \
        fileset.c       \
        filters.c       \
-       g711.c \
-       merge.c \
+       g711.c          \
+       iface_monitor.c \
+       merge.c         \
        proto_hier_stats.c      \
-       recent.c        \
        summary.c       \
        tempfile.c      \
        u3.c            \
-       ui/util.c
+       ws80211_utils.c
 
 # corresponding headers
-wireshark_INCLUDES =   \
+WIRESHARK_COMMON_INCLUDES =    \
        airpcap.h       \
        airpcap_loader.h \
-       ui/alert_box.h  \
        capture.h       \
        capture_info.h  \
        capture_opts.h  \
        color_filters.h \
        filters.h       \
-       g711.h  \
+       g711.h          \
        globals.h       \
-       ui/last_open_dir.h      \
-       log.h   \
-       ui/main_statusbar.h     \
-       merge.h \
-       ui/progress_dlg.h       \
-       ui/recent.h     \
-       ui/recent_utils.h       \
+       iface_monitor.h \
+       log.h           \
+       merge.h         \
        proto_hier_stats.h      \
-       ui/simple_dialog.h      \
        stat_menu.h     \
        summary.h       \
        sync_pipe.h     \
-       u3.h    \
-       ui/ui_util.h
+       u3.h            \
+       ws80211_utils.h
 
 # tshark specifics
 tshark_SOURCES =       \
-       $(WIRESHARK_COMMON_SRC) \
+       $(SHARK_COMMON_SRC)     \
        $(SHARK_COMMON_CAPTURE_SRC) \
-       $(TSHARK_TAP_SRC)       \
        capture_opts.c          \
        tempfile.c              \
-       tshark-tap-register.c   \
-       tshark.c                \
-       ui/util.c
+       tshark.c
 
 # rawshark specifics
 rawshark_SOURCES =     \
-       $(WIRESHARK_COMMON_SRC) \
-       rawshark.c              \
-       ui/util.c
+       $(SHARK_COMMON_SRC)     \
+       rawshark.c
 
 # text2pcap specifics
 text2pcap_SOURCES = \
+       pcapio.c \
        text2pcap.c \
        text2pcap-scanner.l
 
+text2pcap_INCLUDES = \
+       pcapio.h \
+       text2pcap.h
+
 # mergecap specifics
 mergecap_SOURCES = \
        mergecap.c \
@@ -226,14 +179,19 @@ editcap_SOURCES = \
        epan/nstime.c \
        $(WTAP_PLUGIN_SOURCES)
 
+# reordercap specifics
+reordercap_SOURCES = \
+       reordercap.c \
+       svnversion.h
+
+# capinfos specifics
 capinfos_SOURCES = \
        capinfos.c \
        $(WTAP_PLUGIN_SOURCES)
 
 # dftest specifics
 dftest_SOURCES =       \
-       ui/cli/dftest.c \
-       ui/util.c
+       dftest.c
 
 # randpkt specifics
 randpkt_SOURCES = \
@@ -242,9 +200,10 @@ randpkt_SOURCES = \
 # dumpcap specifics
 dumpcap_SOURCES =      \
        $(PLATFORM_SRC) \
-       capture_opts.c \
+       capture_opts.c  \
        capture-pcap-util.c     \
        capture_stop_conditions.c       \
+       cfutils.c       \
        clopts_common.c \
        conditions.c    \
        dumpcap.c       \
@@ -252,7 +211,8 @@ dumpcap_SOURCES =   \
        ringbuffer.c    \
        sync_pipe_write.c       \
        tempfile.c      \
-       version_info.c
+       version_info.c  \
+       ws80211_utils.c
 
 # corresponding headers
 dumpcap_INCLUDES = \
@@ -263,7 +223,7 @@ dumpcap_INCLUDES = \
 
 # this target needed for distribution only
 noinst_HEADERS =       \
-       $(WIRESHARK_COMMON_INCLUDES) \
+       $(SHARK_COMMON_INCLUDES) \
        $(SHARK_COMMON_CAPTURE_INCLUDES) \
-       $(wireshark_INCLUDES) \
+       $(WIRESHARK_COMMON_INCLUDES) \
        $(dumpcap_INCLUDES)