replace *a lot* of file related calls by their GLib counterparts. This is necessary...

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

diff --git a/Makefile.common b/Makefile.common
index 4adc7dfa7aba7406f7caa9693c7027dc517b4b4b..1ecf008e9d470b9b783458b5f2b272fc9bd5af82 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -23,43 +23,31 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-# Header files for dissector helpers
-# XXX - these should be moved to epan/dissectors
-DISSECTOR_SUPPORT_INCLUDES =   \
-       aftypes.h       \
-       arcnet_pids.h   \
-       asn1.h  \
-       bridged_pids.h  \
-       chdlctypes.h    \
-       etypes.h        \
-       follow.h        \
-       format-oid.h    \
-       greproto.h      \
-       iax2_codec_type.h       \
-       ip_opts.h       \
-       isprint.h       \
-       lapd_sapi.h     \
-       llcsaps.h       \
-       nlpid.h \
-       oui.h   \
-       ppptypes.h      \
-       ptvcursor.h     \
-       reassemble.h    \
-       rpc_defrag.h    \
-       rtp_pt.h        \
-       sctpppids.h     \
-       smb.h   \
-       x264_prt_id.h   \
-       xmlstub.h
-
 # "BUILT_SOURCES" are built before any "make all" or "make check" targets.
-BUILT_SOURCES =                \
-       svnversion.h \
+BUILT_HEADER_FILES =   \
+       svnversion.h
+
+BUILT_C_FILES =                \
        ps.c
 
+BUILT_SOURCES =        $(BUILT_C_FILES) $(BUILT_HEADER_FILES)
+
+# Header files generated from source files.
+GENERATED_HEADER_FILES = \
+       $(BUILT_HEADER_FILES)
+
+# C source files generated from source files.
+GENERATED_C_FILES = \
+       $(BUILT_C_FILES)        \
+       tethereal-tap-register.c
+
+# All the generated files.
+GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
+
 # sources common for ethereal and tethereal
 ETHEREAL_COMMON_SRC =  \
        $(PLATFORM_SRC) \
+       capture_errs.c  \
        capture_stop_conditions.c       \
        capture_ui_utils.c      \
        cfile.c \
@@ -77,8 +65,8 @@ ETHEREAL_COMMON_SRC = \
 
 # corresponding headers
 ETHEREAL_COMMON_INCLUDES =     \
-       $(DISSECTOR_SUPPORT_INCLUDES)   \
        svnversion.h            \
+       capture_errs.h  \
        capture_stop_conditions.h       \
        capture_ui_utils.h      \
        cfile.h \
@@ -87,6 +75,8 @@ ETHEREAL_COMMON_INCLUDES =    \
        conditions.h    \
        disabled_protos.h       \
        file.h  \
+       fileset.h       \
+       isprint.h       \
        packet-range.h  \
        pcap-util.h     \
        pcap-util-int.h \
@@ -100,6 +90,7 @@ ETHEREAL_COMMON_INCLUDES =   \
 
 # sources for Tethereal taps
 TETHEREAL_TAP_SRC =    \
+       tap-afpstat.c   \
        tap-ansi_astat.c        \
        tap-bootpstat.c \
        tap-dcerpcstat.c        \
@@ -114,12 +105,14 @@ TETHEREAL_TAP_SRC =       \
        tap-protohierstat.c     \
        tap-rpcstat.c   \
        tap-rpcprogs.c  \
+       tap-sctpchunkstat.c     \
        tap-sipstat.c \
        tap-smbsids.c   \
        tap-smbstat.c   \
+       tap-stats_tree.c        \
        tap-wspstat.c
 
-# helpers alraedy available on some platforms (and on others not)
+# helpers already available on some platforms (and on others not)
 EXTRA_ethereal_SOURCES =       \
        snprintf.c      \
        strerror.c      \
@@ -141,10 +134,12 @@ ethereal_SOURCES =        \
        $(ETHEREAL_COMMON_SRC)  \
        alert_box.c     \
        capture.c       \
+       capture_opts.c \
        capture_sync.c  \
        capture_loop.c  \
        color_filters.c \
        file.c  \
+       fileset.c       \
        filters.c       \
        g711.c \
        merge.c \
@@ -160,12 +155,14 @@ ethereal_INCLUDES =       \
        filters.h       \
        g711.h  \
        globals.h       \
+       log.h   \
        main_window.h   \
        menu.h  \
        merge.h \
        progress_dlg.h  \
        proto_hier_stats.h      \
        simple_dialog.h \
+       stat_menu.h     \
        statusbar.h     \
        summary.h       \
        tap_dfilter_dlg.h       \
@@ -175,6 +172,7 @@ ethereal_INCLUDES = \
 tethereal_SOURCES =    \
        $(ETHEREAL_COMMON_SRC)  \
        $(TETHEREAL_TAP_SRC)    \
+       capture_opts.c          \
        tethereal-tap-register.c        \
        tethereal.c
 
@@ -204,7 +202,6 @@ randpkt_SOURCES = \
 
 # this target needed for distribution only
 noinst_HEADERS =       \
-       $(DISSECTOR_SUPPORT_INCLUDES) \
        $(ETHEREAL_COMMON_INCLUDES) \
        $(ethereal_INCLUDES) \
        $(EXTRA_ethereal_INCLUDES)