Include latest configuration files and remove ones no longer shipped.

(Without these configuration files defragmentation was failing - unsure why!)

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

diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake
index 730276f26abf116cb847b6caf0ac6457997d32e2..e1bff4d57ac15f8dea592c0933bdcd58fe1c70c6 100644 (file)
--- a/packaging/u3/win32/makefile.nmake
+++ b/packaging/u3/win32/makefile.nmake
@@ -106,7 +106,6 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs  manifest.u3i u3util
        $(COPY) $(TOPDIR)\dtds\watcherinfo.dtd $(DEVICE)\dtds $(COPY_FLAGS)
        $(COPY) $(TOPDIR)\doc\dumpcap.html $(DEVICE) $(COPY_FLAGS)
        $(COPY) $(TOPDIR)\doc\editcap.html $(DEVICE) $(COPY_FLAGS)
-       $(COPY) $(TOPDIR)\example_snmp_users_file $(DEVICE) $(COPY_FLAGS)
        $(COPY) $(TOPDIR)\help\toc $(DEVICE)\help $(COPY_FLAGS)
        $(COPY) $(TOPDIR)\help\overview.txt $(DEVICE)\help $(COPY_FLAGS)
        $(COPY) $(TOPDIR)\help\getting_started.txt $(DEVICE)\help $(COPY_FLAGS)
@@ -224,7 +223,9 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs  manifest.u3i u3util
        $(COPY) $(TOPDIR)\epan\wslua\dtd_gen.lua $(DEVICE) $(COPY_FLAGS)
 !ENDIF
        $(COPY) $(TOPDIR)\packaging\nsis\WinPcap_4_0_1.exe $(DEVICE) $(COPY_FLAGS)
-       $(COPY) $(TOPDIR)\dfilter_macros $(DEVICE) $(COPY_FLAGS)
+       $(COPY) $(TOPDIR)\cfilters $(DEVICE) $(COPY_FLAGS)
+       $(COPY) $(TOPDIR)\colorfilters $(DEVICE) $(COPY_FLAGS)
+       $(COPY) $(TOPDIR)\dfilters $(DEVICE) $(COPY_FLAGS)
 # host
 #
 # these files are copied onto the U3 host and are required to make Wireshark stable