osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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.

svn path=/trunk/; revision=17919
This commit is contained in:
Guy Harris 2006-04-20 02:21:28 +00:00
parent 4a67045746
commit fd1cec8917
7 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/Makefile.am
View File

@ -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

4
epan/dissectors/Makefile.nmake
View File

@ -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

8
plugins/docsis/Makefile.am
View File

@ -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

4
plugins/docsis/Makefile.nmake
View File

@ -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

4
tools/Makefile.am
View File

@ -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 \

1
tools/make-reg-dotc → tools/make-dissector-reg
View File

@ -42,7 +42,6 @@ then
#endif
#include <gmodule.h>
#include "register.h"
#include "moduleinfo.h"

1
tools/make-reg-dotc.py → tools/make-dissector-reg.py
View File

@ -104,7 +104,6 @@ if registertype == "plugin":
#endif
#include <gmodule.h>
#include "register.h"
#include "moduleinfo.h"