Rename "make-reg-dotc" to "make-dissector-reg", and do the same for the

Python versions, as it no longer makes only "register.c", it can also
make a "plugin.c" file for a plugin.

When making "plugin.c", there's no need to include "register.h", as it's
not defining any functions declared there.

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

diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index cbe866d64763e1149214fb24c5850c23b6aa7b87..5847115d8c968f1cdd8ee67a9e251a306e7c18f3 100644 (file)
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -83,15 +83,15 @@ x11-declarations.h x11-register-info.h: $(PROC_X11_FIELDS) $(X11_FIELDS)
 # a register.c file for libethereal.
 # All subsequent arguments are the files to scan.
 #
-register.c: $(plugin_src) $(DISSECTOR_SRC) $(top_srcdir)/tools/make-reg-dotc \
-    $(top_srcdir)/tools/make-reg-dotc.py
+register.c: $(plugin_src) $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
+    $(top_srcdir)/tools/make-dissector-reg.py
        @if test -n $(PYTHON); then \
                echo Making register.c with python ; \
-               $(PYTHON) $(top_srcdir)/tools/make-reg-dotc.py $(srcdir) \
+               $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
                    dissectors $(DISSECTOR_SRC) ; \
        else \
                echo Making register.c with shell script ; \
-               $(top_srcdir)/tools/make-reg-dotc $(srcdir) \
+               $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
                   dissectors $(plugin_src) $(DISSECTOR_SRC) ; \
        fi
 

diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake
index 36fb60cb9c46914b936657a8733b9719ab16c2b2..f8f4940a854834f9261920328eaaf427ea7bdd70 100644 (file)
--- a/epan/dissectors/Makefile.nmake
+++ b/epan/dissectors/Makefile.nmake
@@ -75,10 +75,10 @@ x11-declarations.h x11-register-info.h: x11-fields process-x11-fields.pl
 register.c: $(DISSECTOR_SRC)
 !IFDEF PYTHON
        @echo Making register.c (using python)
-       @$(PYTHON) ../../tools/make-reg-dotc.py . dissectors $(DISSECTOR_SRC)
+       @$(PYTHON) ../../tools/make-dissector-reg.py . dissectors $(DISSECTOR_SRC)
 !ELSE
        @echo Making register.c (using sh)
-       @$(SH) ../../tools/make-reg-dotc . dissectors $(DISSECTOR_SRC)
+       @$(SH) ../../tools/make-dissector-reg . dissectors $(DISSECTOR_SRC)
 !ENDIF
 
 packet-ncp2222.c : ncp2222.py

diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am
index bcf6f4f10f68baf205dfbb9e6ad077492ace91b1..46cc8355a2133008dd22e7e28adda232bdd9574c 100644 (file)
--- a/plugins/docsis/Makefile.am
+++ b/plugins/docsis/Makefile.am
@@ -75,15 +75,15 @@ LIBS =
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-reg-dotc \
-    $(top_srcdir)/tools/make-reg-dotc.py
+plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
+    $(top_srcdir)/tools/make-dissector-reg.py
        @if test -n $(PYTHON); then \
                echo Making plugin.c with python ; \
-               $(PYTHON) $(top_srcdir)/tools/make-reg-dotc.py $(srcdir) \
+               $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
                    plugin $(DISSECTOR_SRC) ; \
        else \
                echo Making plugin.c with shell script ; \
-               $(top_srcdir)/tools/make-reg-dotc $(srcdir) \
+               $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
                    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
        fi
 

diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index 32883427d9e354d936031fcbef7ecc9c10e50f9c..383dbf300d1d3dd70b1ff239ba97efa7c586dacb 100644 (file)
--- a/plugins/docsis/Makefile.nmake
+++ b/plugins/docsis/Makefile.nmake
@@ -63,10 +63,10 @@ docsis.dll docsis.exp docsis.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 plugin.c: $(DISSECTOR_SRC)
 !IFDEF PYTHON
        @echo Making plugin.c (using python)
-       @$(PYTHON) ../../tools/make-reg-dotc.py . plugin $(DISSECTOR_SRC)
+       @$(PYTHON) ../../tools/make-dissector-reg.py . plugin $(DISSECTOR_SRC)
 !ELSE
        @echo Making plugin.c (using sh)
-       @$(SH) ../../tools/make-reg-dotc . plugin $(DISSECTOR_SRC)
+       @$(SH) ../../tools/make-dissector-reg . plugin $(DISSECTOR_SRC)
 !ENDIF
 
 !ENDIF

diff --git a/tools/Makefile.am b/tools/Makefile.am
index c9066aa8579b23569385a8ad6d677cf1fa1381c7..9ecf845386cba3f0e21681162feba5de3d971aa5 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -72,8 +72,8 @@ EXTRA_DIST = \
        dfilter-test.py                                 \
        fuzz-test.sh                                    \
        lex.py                                          \
-       make-reg-dotc                                   \
-       make-reg-dotc.py                                \
+       make-dissector-reg                              \
+       make-dissector-reg.py                           \
        msnchat                                         \
        netscreen2dump.py                               \
        pkt-from-core.py                                \

diff --git a/tools/make-reg-dotc b/tools/make-dissector-reg
similarity index 99%
rename from tools/make-reg-dotc
rename to tools/make-dissector-reg
index 19706dada56dbcad8934453093d90ebfa3221c38..fe403cc5f6988b00b7b5605b1769f7c19324ccbe 100755 (executable)
--- a/tools/make-reg-dotc
+++ b/tools/make-dissector-reg
@@ -42,7 +42,6 @@ then
 #endif
 
 #include <gmodule.h>
-#include "register.h"
 
 #include "moduleinfo.h"
 

diff --git a/tools/make-reg-dotc.py b/tools/make-dissector-reg.py
similarity index 99%
rename from tools/make-reg-dotc.py
rename to tools/make-dissector-reg.py
index 9d6a232edbddc6e3591b41e38bd836af41e35e2e..31de5549a18b047371669a6386ff8f4a39af447f 100644 (file)
--- a/tools/make-reg-dotc.py
+++ b/tools/make-dissector-reg.py
@@ -104,7 +104,6 @@ if registertype == "plugin":
 #endif
 
 #include <gmodule.h>
-#include "register.h"
 
 #include "moduleinfo.h"