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

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

diff --git a/Makefile.am b/Makefile.am
index 5c28e9523114e0aa2542695b9b7fc4a3b30a3d2f..bd869b36cafa6abe700c356dcaeb54f99e8309bd 100644 (file)
--- a/Makefile.am
+++ b/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 \

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 7c8bd335730477a76132ed0b76e71e14fb1ee5f2..9126597408dc97dde2b5be527d3b7db80baebd31 100644 (file)
--- a/packaging/nsis/wireshark.nsi
+++ b/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

diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake
index 19aac681a198fad7ac8bf0fb4485b140ba46e07a..1a2bcc45c5438bf5bb70405819b541c7b1125984 100644 (file)
--- a/packaging/u3/win32/makefile.nmake
+++ b/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)

diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am
index e6bfac272c5b8297b67f970245d240cdfc672991..d1d926c9f2baee7ef5253cd4735a6c0656afe646 100644 (file)
--- a/plugins/wimaxasncp/Makefile.am
+++ b/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
+

diff --git a/plugins/wimaxasncp/dictionary.dtd b/wimaxasncp/dictionary.dtd
similarity index 100%
rename from plugins/wimaxasncp/dictionary.dtd
rename to wimaxasncp/dictionary.dtd

diff --git a/plugins/wimaxasncp/dictionary.xml b/wimaxasncp/dictionary.xml
similarity index 100%
rename from plugins/wimaxasncp/dictionary.xml
rename to wimaxasncp/dictionary.xml