Allow the Gtk+ and Qt versions to be built simultaneously (with autotools).
[metze/wireshark/wip.git] / Makefile.common
index 90283361bbe7a1935cbdc85ba87e91eae30e4521..635e8c4ff05e638458835820661e384f00fe1e4c 100644 (file)
@@ -44,7 +44,7 @@ GENERATED_C_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                 \
@@ -62,16 +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 \
-       capture_unix_ifnames.h  \
        cfile.h                 \
        cfutils.h               \
        clopts_common.h         \
        cmdarg_err.h            \
-       console_io.h            \
        color.h                 \
        disabled_protos.h       \
        file.h                  \
@@ -99,24 +97,25 @@ SHARK_COMMON_CAPTURE_SRC =  \
 # corresponding headers
 SHARK_COMMON_CAPTURE_INCLUDES =        \
        capture_ifinfo.h        \
+       capture_session.h       \
        capture_sync.h          \
        capture_ui_utils.h
 
 # wireshark specifics
-wireshark_SOURCES =    \
-       $(WIRESHARK_COMMON_SRC) \
+WIRESHARK_COMMON_SRC = \
+       $(SHARK_COMMON_SRC)     \
        $(SHARK_COMMON_CAPTURE_SRC) \
        airpcap_loader.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 \
+       g711.c          \
        iface_monitor.c \
-       merge.c \
+       merge.c         \
        proto_hier_stats.c      \
        summary.c       \
        tempfile.c      \
@@ -124,7 +123,7 @@ wireshark_SOURCES = \
        ws80211_utils.c
 
 # corresponding headers
-wireshark_INCLUDES =   \
+WIRESHARK_COMMON_INCLUDES =    \
        airpcap.h       \
        airpcap_loader.h \
        capture.h       \
@@ -132,11 +131,11 @@ wireshark_INCLUDES =      \
        capture_opts.h  \
        color_filters.h \
        filters.h       \
-       g711.h  \
+       g711.h          \
        globals.h       \
        iface_monitor.h \
-       log.h   \
-       merge.h \
+       log.h           \
+       merge.h         \
        proto_hier_stats.h      \
        stat_menu.h     \
        summary.h       \
@@ -146,7 +145,7 @@ wireshark_INCLUDES =        \
 
 # tshark specifics
 tshark_SOURCES =       \
-       $(WIRESHARK_COMMON_SRC) \
+       $(SHARK_COMMON_SRC)     \
        $(SHARK_COMMON_CAPTURE_SRC) \
        capture_opts.c          \
        tempfile.c              \
@@ -154,7 +153,7 @@ tshark_SOURCES =    \
 
 # rawshark specifics
 rawshark_SOURCES =     \
-       $(WIRESHARK_COMMON_SRC) \
+       $(SHARK_COMMON_SRC)     \
        rawshark.c
 
 # text2pcap specifics
@@ -201,7 +200,7 @@ randpkt_SOURCES = \
 # dumpcap specifics
 dumpcap_SOURCES =      \
        $(PLATFORM_SRC) \
-       capture_opts.c \
+       capture_opts.c  \
        capture-pcap-util.c     \
        capture_stop_conditions.c       \
        cfutils.c       \
@@ -224,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)