Remove two tests for fail return from g_malloc(); Fixes Coverity #424 "FORWARD_NULL"

[metze/wireshark/wip.git] / Makefile.common

diff --git a/Makefile.common b/Makefile.common
index 1a13fc5101c251b96bc18b31e370f0b8c8a4a762..930c004c41acd54683372250078c17f3e409320a 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -69,6 +69,7 @@ WIRESHARK_COMMON_INCLUDES =   \
        cfile.h \
        clopts_common.h \
        cmdarg_err.h    \
+       console_io.h    \
        color.h \
        disabled_protos.h       \
        file.h  \
@@ -123,29 +124,15 @@ TSHARK_TAP_SRC =  \
        tap-rpcstat.c   \
        tap-rpcprogs.c  \
        tap-rtp.c       \
+       tap-scsistat.c  \
        tap-sctpchunkstat.c     \
        tap-sipstat.c \
        tap-smbsids.c   \
        tap-smbstat.c   \
        tap-stats_tree.c        \
+       tap-sv.c \
        tap-wspstat.c
 
-# helpers already available on some platforms (and on others not)
-EXTRA_wireshark_SOURCES =      \
-       wsgetopt.c      \
-       inet_ntop.c     \
-       inet_pton.c     \
-       strerror.c      \
-       strncasecmp.c   \
-       strptime.c
-
-# corresponding headers
-EXTRA_wireshark_INCLUDES =     \
-       wsgetopt.h      \
-       inet_v6defs.h   \
-       strerror.h      \
-       strptime.h
-
 # wireshark specifics
 wireshark_SOURCES =    \
        $(WIRESHARK_COMMON_SRC) \
@@ -164,7 +151,8 @@ wireshark_SOURCES = \
        merge.c \
        proto_hier_stats.c      \
        summary.c       \
-       tempfile.c
+       tempfile.c      \
+       u3.c
 
 # corresponding headers
 wireshark_INCLUDES =   \
@@ -180,6 +168,7 @@ wireshark_INCLUDES =        \
        g711.h  \
        globals.h       \
        log.h   \
+       main_statusbar.h        \
        merge.h \
        progress_dlg.h  \
        proto_hier_stats.h      \
@@ -187,6 +176,7 @@ wireshark_INCLUDES =        \
        stat_menu.h     \
        summary.h       \
        sync_pipe.h     \
+       u3.h    \
        ui_util.h
 
 # tshark specifics
@@ -263,5 +253,4 @@ noinst_HEADERS =    \
        $(WIRESHARK_COMMON_INCLUDES) \
        $(SHARK_COMMON_CAPTURE_INCLUDES) \
        $(wireshark_INCLUDES) \
-       $(EXTRA_wireshark_INCLUDES) \
        $(dumpcap_INCLUDES)