From f62bdd4d4c3980c9292699266989301f423f1264 Mon Sep 17 00:00:00 2001 From: krj Date: Sun, 4 Oct 2009 08:10:54 +0000 Subject: [PATCH] Move make-tapreg-dotc to tools/make-tapreg-dotc git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30284 f5534014-38df-0310-8fa8-9805f1628bb7 --- CMakeLists.txt | 4 ++-- Makefile.am | 5 ++--- Makefile.nmake | 4 ++-- tools/Makefile.am | 3 ++- make-tapreg-dotc => tools/make-tapreg-dotc | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename make-tapreg-dotc => tools/make-tapreg-dotc (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12d4972456..ce17eb8a67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -412,12 +412,12 @@ target_link_libraries(lemon ${lemon_LIBS}) ADD_CUSTOM_COMMAND( OUTPUT tshark-tap-register.c COMMAND ${SHELL} - ${CMAKE_SOURCE_DIR}/make-tapreg-dotc + ${CMAKE_SOURCE_DIR}/tools/make-tapreg-dotc tshark-tap-register.c ${CMAKE_CURRENT_SOURCE_DIR} ${TSHARK_TAP_SRC} DEPENDS - ${CMAKE_SOURCE_DIR}/make-tapreg-dotc + ${CMAKE_SOURCE_DIR}/tools/make-tapreg-dotc ${TSHARK_TAP_SRC} ) diff --git a/Makefile.am b/Makefile.am index fba0cafe7b..69bd1df628 100644 --- a/Makefile.am +++ b/Makefile.am @@ -524,9 +524,9 @@ SUFFIXES = .sh # The first argument is the directory in which the source files live. # All subsequent arguments are the files to scan. # -tshark-tap-register.c: $(TSHARK_TAP_SRC) $(srcdir)/make-tapreg-dotc +tshark-tap-register.c: $(TSHARK_TAP_SRC) $(srcdir)/tools/make-tapreg-dotc @echo Making tshark-tap-register.c - @$(srcdir)/make-tapreg-dotc tshark-tap-register.c $(srcdir) $(TSHARK_TAP_SRC) + @$(srcdir)/tools/make-tapreg-dotc tshark-tap-register.c $(srcdir) $(TSHARK_TAP_SRC) ps.c: print.ps $(srcdir)/tools/rdps.py $(PYTHON) $(srcdir)/tools/rdps.py $(srcdir)/print.ps ps.c @@ -791,7 +791,6 @@ EXTRA_DIST = \ image/wssplash-dev.xpm \ ipmap.html \ make-manuf \ - make-tapreg-dotc \ make-version.pl \ manuf \ manuf.tmpl \ diff --git a/Makefile.nmake b/Makefile.nmake index 4ee6261002..a1da5b323a 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -405,9 +405,9 @@ svnversion.h: $(SVNENTRIES) # The second argument is the directory in which the source files live. # All subsequent arguments are the files to scan. # -tshark-tap-register.c: $(TSHARK_TAP_SRC) make-tapreg-dotc +tshark-tap-register.c: $(TSHARK_TAP_SRC) tools\make-tapreg-dotc @echo Making tshark-tap-register.c - @$(SH) make-tapreg-dotc tshark-tap-register.c . $(TSHARK_TAP_SRC) + @$(SH) tools/make-tapreg-dotc tshark-tap-register.c . $(TSHARK_TAP_SRC) text2pcap-scanner.c : text2pcap-scanner.l $(LEX) -otext2pcap-scanner.c text2pcap-scanner.l diff --git a/tools/Makefile.am b/tools/Makefile.am index a32dffdcab..25efed4675 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -93,8 +93,9 @@ EXTRA_DIST = \ idl2wrs.sh.in \ lex.py \ Makefile.nmake \ - make-dissector-reg \ + make-dissector-reg \ make-dissector-reg.py \ + make-tapreg-dotc \ make-tap-reg.py \ msnchat \ native-nmake.cmd \ diff --git a/make-tapreg-dotc b/tools/make-tapreg-dotc similarity index 100% rename from make-tapreg-dotc rename to tools/make-tapreg-dotc -- 2.34.1