Update the Win32 Nmakefiles to reflect the move of the color code into

the "gtk" directory and the split of that code into "colors.c" and
"color_dlg.c".

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

diff --git a/Makefile.nmake b/Makefile.nmake
index fa8472c3386ed2c6cf9e2a0c877596cb5224ff74..80ac782d840bdc20ff51583076a6796d51f17d1a 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -147,7 +147,6 @@ ethereal_OBJECTS = \
        $(DISSECTOR_OBJECTS) \
        $(ETHEREAL_COMMON_OBJECTS) \
        capture.obj      \
-       colors.obj       \
        file.obj         \
        summary.obj      \
 
@@ -159,7 +158,6 @@ EXTRA_ethereal_OBJECTS = \
        inet_pton.obj     \
        inet_ntop.obj
 
-
 LIBS= wiretap\libwtap.lib gtk\libui.lib wsock32.lib user32.lib \
        $(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \
        $(GTK_DIR)\gdk\win32\gdk-$(GTK_VERSION).lib \

diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index b1842d8e57ba0e31638a05b9423ab3c991cc641f..c331a04bd3e339030ece59cdbc7e54c494aa2daa 100644 (file)
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -12,6 +12,8 @@ CFLAGS=/DHAVE_CONFIG_H /I.. /I../wiretap \
 # some functions that have disappeared in gtk+-1.3. I might
 # get around to #ifdef'ing them out in our gtkclist.c.
 OBJECTS=capture_dlg.obj \
+       colors.obj       \
+       color_dlg.obj    \
        column_prefs.obj \
        display_opts.obj \
        file_dlg.obj \