Move alert_box.c back up to the top-level directory for now, to fix the
authorGuy Harris <guy@alum.mit.edu>
Mon, 16 Jan 2012 03:23:22 +0000 (03:23 -0000)
committerGuy Harris <guy@alum.mit.edu>
Mon, 16 Jan 2012 03:23:22 +0000 (03:23 -0000)
Windows build.  We probably want to construct a "ui" (static) library
the same way we construct the libwireshark (dynamic) library, out of
stuff in the ui directory and the relevant subdirectories.

svn path=/trunk/; revision=40541

Makefile.common
alert_box.c [moved from ui/alert_box.c with 98% similarity]

index c74388ccde3de300a9010e16d9486fddfcdd8fca..e40308554935933bff59af4b9aa7d5c582ed8d7c 100644 (file)
@@ -147,6 +147,7 @@ wireshark_SOURCES = \
        $(WIRESHARK_COMMON_SRC) \
        $(SHARK_COMMON_CAPTURE_SRC) \
        airpcap_loader.c \
+       alert_box.c     \
        capture.c       \
        capture_info.c  \
        capture_opts.c \
@@ -159,8 +160,7 @@ wireshark_SOURCES = \
        proto_hier_stats.c      \
        summary.c       \
        tempfile.c      \
-       u3.c            \
-       ui/alert_box.c
+       u3.c
 
 # corresponding headers
 wireshark_INCLUDES =   \
similarity index 98%
rename from ui/alert_box.c
rename to alert_box.c
index 666759df0ff6e35d2e1924f174332dddc302cf15..148f35689c944e2bb843b8cf2428f1ca8c3aed99 100644 (file)
@@ -34,9 +34,9 @@
 #include <epan/filesystem.h>
 #include <epan/dfilter/dfilter.h>
 
-#include "alert_box.h"
+#include "ui/alert_box.h"
 
-#include "simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 /*
  * Alert box for general errors.