Add a #define for the wildcard pattern that matches all files.

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

diff --git a/Makefile.common b/Makefile.common
index f47aa9389e034bf3ea1ba47418f45aa25e6a919f..a9fa08e2696f3e5737ea90e24bd45df3e2f4801a 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -3,8 +3,6 @@
 #     a) common to both files and
 #     b) portable between both files
 #
-# $Id$
-#
 # Wireshark - Network traffic analyzer
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
@@ -25,7 +23,7 @@
 
 # "BUILT_SOURCES" are built before any "make all" or "make check" targets.
 BUILT_HEADER_FILES =   \
-       svnversion.h
+       version.h
 
 BUILT_C_FILES =
 
@@ -33,6 +31,7 @@ BUILT_SOURCES =       $(BUILT_C_FILES) $(BUILT_HEADER_FILES)
 
 # Header files generated from source files.
 GENERATED_HEADER_FILES = \
+       text2pcap-scanner_lex.h \
        $(BUILT_HEADER_FILES)
 
 # C source files generated from source files.
@@ -43,86 +42,48 @@ GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
 
 # sources common for wireshark, tshark, and rawshark
 SHARK_COMMON_SRC =     \
-       $(PLATFORM_PCAP_SRC)    \
-       capture-pcap-util.c     \
        cfile.c                 \
-       cfutils.c               \
-       clopts_common.c         \
        frame_tvbuff.c          \
        sync_pipe_write.c       \
-       version_info.c
+       extcap.c                \
+       extcap_parser.c
 
 # corresponding headers
 SHARK_COMMON_INCLUDES =        \
-       svnversion.h            \
-       capture-pcap-util.h     \
-       capture-pcap-util-int.h \
        cfile.h                 \
-       cfutils.h               \
-       clopts_common.h         \
-       cmdarg_err.h            \
-       color.h                 \
+       extcap.h                \
+       extcap_parser.h         \
        file.h                  \
        fileset.h               \
        frame_tvbuff.h          \
        register.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
-SHARK_COMMON_CAPTURE_SRC =     \
-       capture_ifinfo.c        \
-       capture_sync.c          \
-       capture_ui_utils.c
-
-# corresponding headers
-SHARK_COMMON_CAPTURE_INCLUDES =        \
-       capture_ifinfo.h        \
-       capture_session.h       \
-       capture_sync.h          \
-       capture_ui_utils.h
-
 # wireshark specifics
 WIRESHARK_COMMON_SRC = \
        $(SHARK_COMMON_SRC)     \
-       $(SHARK_COMMON_CAPTURE_SRC) \
-       airpcap_loader.c \
-       capture.c       \
        capture_info.c  \
        capture_opts.c  \
-       color_filters.c \
        file.c          \
        fileset.c       \
-       filters.c       \
-       iface_monitor.c \
-       proto_hier_stats.c      \
-       summary.c       \
-       ws80211_utils.c
+       filter_files.c \
+       summary.c
 
 # corresponding headers
 WIRESHARK_COMMON_INCLUDES =    \
-       airpcap.h       \
-       airpcap_loader.h \
-       capture.h       \
        capture_info.h  \
        capture_opts.h  \
-       color_filters.h \
-       filters.h       \
+       filter_files.h \
        globals.h       \
-       iface_monitor.h \
        log.h           \
-       proto_hier_stats.h      \
-       stat_menu.h     \
        summary.h       \
-       sync_pipe.h     \
-       ws80211_utils.h
+       sync_pipe.h
 
 # tshark specifics
 tshark_SOURCES =       \
        $(SHARK_COMMON_SRC)     \
-       $(SHARK_COMMON_CAPTURE_SRC) \
        capture_opts.c          \
+       filter_files.c          \
        tshark.c
 
 # tfshark specifics
@@ -137,8 +98,8 @@ rawshark_SOURCES =   \
 
 # text2pcap specifics
 text2pcap_SOURCES = \
-       pcapio.c \
-       text2pcap.c \
+       pcapio.c                \
+       text2pcap.c             \
        text2pcap-scanner.l
 
 text2pcap_INCLUDES = \
@@ -155,8 +116,7 @@ editcap_SOURCES = \
 
 # reordercap specifics
 reordercap_SOURCES = \
-       reordercap.c \
-       svnversion.h
+       reordercap.c
 
 # capinfos specifics
 capinfos_SOURCES = \
@@ -170,25 +130,31 @@ captype_SOURCES = \
 dftest_SOURCES =       \
        dftest.c
 
+# echld specifics
+echld_test_SOURCES =   \
+       echld_test.c    \
+       capture_opts.c  \
+       capture_stop_conditions.c       \
+       cfile.c         \
+       conditions.c    \
+       pcapio.c        \
+       ringbuffer.c    \
+       sync_pipe_write.c
+
 # randpkt specifics
 randpkt_SOURCES = \
        randpkt.c
 
 # dumpcap specifics
 dumpcap_SOURCES =      \
-       $(PLATFORM_PCAP_SRC) \
        capture_opts.c  \
-       capture-pcap-util.c     \
        capture_stop_conditions.c       \
-       cfutils.c       \
-       clopts_common.c \
        conditions.c    \
        dumpcap.c       \
+       filter_files.c  \
        pcapio.c        \
        ringbuffer.c    \
-       sync_pipe_write.c       \
-       version_info.c  \
-       ws80211_utils.c
+       sync_pipe_write.c
 
 # corresponding headers
 dumpcap_INCLUDES = \
@@ -200,6 +166,5 @@ dumpcap_INCLUDES = \
 # this target needed for distribution only
 noinst_HEADERS =       \
        $(SHARK_COMMON_INCLUDES) \
-       $(SHARK_COMMON_CAPTURE_INCLUDES) \
        $(WIRESHARK_COMMON_INCLUDES) \
        $(dumpcap_INCLUDES)