In source tree, move wimaxasncp TLV files from plugin folder -> new top-level wimaxasncp folder.

svn path=/trunk/; revision=23184

Makefile.am

@@ -138,6 +138,7 @@ dtds_DATA = \
 	dtds/xcap-caps.dtd \
 	dtds/xcap-error.dtd \
 	dtds/watcherinfo.dtd
+
 #
 # Install the RADIUS directory files in the "radius" subdirectory
 # of that directory.
@@ -207,6 +208,15 @@ radius_DATA = \
 	radius/dictionary.wispr  \
 	radius/dictionary.xedia
 
+#
+# Install the wimaxasncp directory files in the "wimaxasncp" subdirectory
+# of that directory
+#
+wimaxasncpdir = $(pkgdatadir)/wimaxasncp
+wimaxasncp_DATA = \
+	wimaxasncp/dictionary.xml \
+	wimaxasncp/dictionary.dtd
+
 PLATFORM_SRC = capture-pcap-util-unix.c
 
 if HAVE_PLUGINS
@@ -667,6 +677,7 @@ EXTRA_DIST = \
 	$(diameter_DATA)	\
 	$(dtds_DATA)		\
 	$(radius_DATA)		\
+	$(wimaxasncp_DATA)		\
 	randpkt.c		\
 	rdps.c			\
 	smi_modules \

packaging/nsis/wireshark.nsi

@@ -497,8 +497,8 @@ SetOutPath $INSTDIR
 ; install the wimaxasncp TLV definitions in the wimaxasncp subdirectory
 ;
 SetOutPath $INSTDIR\wimaxasncp
-File "..\..\plugins\wimaxasncp\dictionary.xml"
-File "..\..\plugins\wimaxasncp\dictionary.dtd"
+File "..\..\wimaxasncp\dictionary.xml"
+File "..\..\wimaxasncp\dictionary.dtd"
 SetOutPath $INSTDIR
 
 SetOutPath $INSTDIR\help

packaging/u3/win32/makefile.nmake

@@ -109,8 +109,8 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs  manifest.u3i u3util
 	$(COPY) $(TOPDIR)\dtds\xcap-caps.dtd $(DEVICE)\dtds $(COPY_FLAGS)
 	$(COPY) $(TOPDIR)\dtds\xcap-error.dtd $(DEVICE)\dtds $(COPY_FLAGS)
 	$(COPY) $(TOPDIR)\dtds\watcherinfo.dtd $(DEVICE)\dtds $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\wimaxasncp\dictionary.xml $(DEVICE)\wimaxasncp $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\wimaxasncp\dictionary.dtd $(DEVICE)\wimaxasncp $(COPY_FLAGS)
+	$(COPY) $(TOPDIR)\wimaxasncp\dictionary.xml $(DEVICE)\wimaxasncp $(COPY_FLAGS)
+	$(COPY) $(TOPDIR)\wimaxasncp\dictionary.dtd $(DEVICE)\wimaxasncp $(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)

plugins/wimaxasncp/Makefile.am

@@ -128,9 +128,7 @@ EXTRA_DIST = \
 	Makefile.common	      \
 	Makefile.nmake        \
 	moduleinfo.nmake      \
-	plugin.rc.in          \
-	dictionary.xml        \
-	dictionary.dtd
+	plugin.rc.in
 
 RUNLEX = $(top_srcdir)/tools/runlex.sh
 
@@ -142,6 +140,4 @@ wimaxasncp_dict_lex.h : wimaxasncp_dict.c
 #
 
 wimaxasncpdir = $(pkgdatadir)/wimaxasncp
-wimaxasncp_DATA = \
-	dictionary.dtd \
-	dictionary.xml
+