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 4c35b6cb4e39819c3a99b651cfb55902b959a86d..a9fa08e2696f3e5737ea90e24bd45df3e2f4801a 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -31,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.
@@ -44,37 +45,35 @@ SHARK_COMMON_SRC =  \
        cfile.c                 \
        frame_tvbuff.c          \
        sync_pipe_write.c       \
-       version_info.c
+       extcap.c                \
+       extcap_parser.c
 
 # corresponding headers
 SHARK_COMMON_INCLUDES =        \
        cfile.h                 \
-       color.h                 \
+       extcap.h                \
+       extcap_parser.h         \
        file.h                  \
        fileset.h               \
        frame_tvbuff.h          \
        register.h              \
-       version_info.h          \
        ws_symbol_export.h
 
 # wireshark specifics
 WIRESHARK_COMMON_SRC = \
        $(SHARK_COMMON_SRC)     \
-       airpcap_loader.c \
        capture_info.c  \
        capture_opts.c  \
-       color_filters.c \
        file.c          \
        fileset.c       \
+       filter_files.c \
        summary.c
 
 # corresponding headers
 WIRESHARK_COMMON_INCLUDES =    \
-       airpcap.h       \
-       airpcap_loader.h \
        capture_info.h  \
        capture_opts.h  \
-       color_filters.h \
+       filter_files.h \
        globals.h       \
        log.h           \
        summary.h       \
@@ -84,6 +83,7 @@ WIRESHARK_COMMON_INCLUDES =   \
 tshark_SOURCES =       \
        $(SHARK_COMMON_SRC)     \
        capture_opts.c          \
+       filter_files.c          \
        tshark.c
 
 # tfshark specifics
@@ -100,8 +100,7 @@ rawshark_SOURCES =  \
 text2pcap_SOURCES = \
        pcapio.c                \
        text2pcap.c             \
-       text2pcap-scanner.l     \
-       version_info.c
+       text2pcap-scanner.l
 
 text2pcap_INCLUDES = \
        pcapio.h \
@@ -109,33 +108,39 @@ text2pcap_INCLUDES = \
 
 # mergecap specifics
 mergecap_SOURCES = \
-       mergecap.c      \
-       version_info.c
+       mergecap.c
 
 # editcap specifics
 editcap_SOURCES = \
-       editcap.c       \
-       version_info.c
+       editcap.c
 
 # reordercap specifics
 reordercap_SOURCES = \
-       reordercap.c    \
-       version_info.c
+       reordercap.c
 
 # capinfos specifics
 capinfos_SOURCES = \
-       capinfos.c      \
-       version_info.c
+       capinfos.c
 
 # captype specifics
 captype_SOURCES = \
-       captype.c       \
-       version_info.c
+       captype.c
 
 # dftest specifics
 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
@@ -146,10 +151,10 @@ dumpcap_SOURCES = \
        capture_stop_conditions.c       \
        conditions.c    \
        dumpcap.c       \
+       filter_files.c  \
        pcapio.c        \
        ringbuffer.c    \
-       sync_pipe_write.c       \
-       version_info.c
+       sync_pipe_write.c
 
 # corresponding headers
 dumpcap_INCLUDES = \