Move color_filters.c and color_filters.h up to the top-level directory,

as they're now (theoretically) toolkit-independent (modulo changes that
might be required to the code to update filter lists when a new filter
is read in).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11500 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.common b/Makefile.common
index a745056efb8289f1932289bedddfab8a75a14e39..eb278e8123ab3d3ebc3973aaddaf86f324c182bb 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -154,6 +154,7 @@ ethereal_SOURCES =  \
        alert_box.c     \
        capture.c       \
        capture_combo_utils.c   \
+       color_filters.c \
        file.c  \
        filters.c       \
        g711.c \
@@ -166,6 +167,7 @@ ethereal_INCLUDES = \
        alert_box.h     \
        capture.h       \
        capture_combo_utils.h   \
+       color_filters.h \
        filters.h       \
        g711.h  \
        globals.h       \

diff --git a/gtk/color_filters.c b/color_filters.c
similarity index 100%
rename from gtk/color_filters.c
rename to color_filters.c

diff --git a/gtk/color_filters.h b/color_filters.h
similarity index 100%
rename from gtk/color_filters.h
rename to color_filters.h

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 7a1bc0e6f8b3acf5e30eebb35a5a01f92277f8ab..eb176a58ef29ab1c64860adfbc3e6530d9d487b8 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -38,7 +38,6 @@ noinst_HEADERS = \
        capture_dlg.h   \
        capture_prefs.h \
        color_dlg.h     \
-       color_filters.h \
        colors.h        \
        column_prefs.h  \
        compat_macros.h \

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index ec464f1250843a773447924b2d61f49c337e44a8..2037131579f3fdfafd6b2ffa6976baf964618add 100644 (file)
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -35,7 +35,6 @@ ETHEREAL_GTK_SRC = \
        capture_info_dlg.c      \
        capture_prefs.c \
        color_dlg.c     \
-       color_filters.c \
        color_utils.c   \
        colors.c        \
        column_prefs.c  \

diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index 8e59e5978c23afbf9b19f981855263cee0998824..26f36b692edee9e36624ecbe358a594b5e960279 100644 (file)
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -50,7 +50,7 @@
 #include "recent.h"
 #include "color.h"
 #include "../ui_util.h"
-#include "gtk/color_filters.h"
+#include "color_filters.h"
 #include "gtk/color_dlg.h"
 #ifdef HAVE_LIBPCAP
 #include "capture_dlg.h"