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".

svn path=/trunk/; revision=1624

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 \

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 \