aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt4
-rw-r--r--Makefile.am6
-rw-r--r--Makefile.nmake4
-rw-r--r--tools/rdps.py (renamed from rdps.py)0
4 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbbc78a288..12d4972456 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -424,11 +424,11 @@ ADD_CUSTOM_COMMAND(
ADD_CUSTOM_COMMAND(
OUTPUT ps.c
COMMAND ${PYTHON_EXECUTABLE}
- ${CMAKE_CURRENT_SOURCE_DIR}/rdps.py
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/rdps.py
${CMAKE_CURRENT_SOURCE_DIR}/print.ps
ps.c
DEPENDS
- ${CMAKE_CURRENT_SOURCE_DIR}/rdps.py
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/rdps.py
${CMAKE_CURRENT_SOURCE_DIR}/print.ps
)
diff --git a/Makefile.am b/Makefile.am
index c51d495194..143275d5bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -528,8 +528,8 @@ tshark-tap-register.c: $(TSHARK_TAP_SRC) $(srcdir)/make-tapreg-dotc
@echo Making tshark-tap-register.c
@$(srcdir)/make-tapreg-dotc tshark-tap-register.c $(srcdir) $(TSHARK_TAP_SRC)
-ps.c: print.ps rdps.py
- $(PYTHON) $(srcdir)/rdps.py $(srcdir)/print.ps ps.c
+ps.c: print.ps $(srcdir)/tools/rdps.py
+ $(PYTHON) $(srcdir)/tools/rdps.py $(srcdir)/print.ps ps.c
#
# XXX - "svnversion.h" is distributed in the release tarball; should
@@ -803,11 +803,11 @@ EXTRA_DIST = \
$(tpncp_DATA) \
$(wimaxasncp_DATA) \
randpkt.c \
- rdps.py \
smi_modules \
text2pcap-scanner.l \
text2pcap.c \
text2pcap.h \
+ tools/rdps.py \
services \
wireshark.desktop \
wka.tmpl
diff --git a/Makefile.nmake b/Makefile.nmake
index b7c3e8c6e4..4ee6261002 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -375,8 +375,8 @@ config.h : config.h.win32 config.nmake
< config.h.win32 > $@
-ps.c : rdps.py print.ps
- $(PYTHON) rdps.py print.ps ps.c
+ps.c: tools\rdps.py print.ps
+ $(PYTHON) tools\rdps.py print.ps ps.c
#
# Build the version string
#
diff --git a/rdps.py b/tools/rdps.py
index 9bb3b04141..9bb3b04141 100644
--- a/rdps.py
+++ b/tools/rdps.py