diff options
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | epan/libethereal.def | 2 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 1 | ||||
| -rw-r--r-- | packaging/nsis/ethereal.nsi | 1 | ||||
| -rw-r--r-- | plugins/Makefile.am | 1 | ||||
| -rw-r--r-- | plugins/Makefile.nmake | 13 |
6 files changed, 19 insertions, 0 deletions
diff --git a/configure.in b/configure.in index b97fbeefd0..92ee7748a2 100644 --- a/configure.in +++ b/configure.in @@ -1238,6 +1238,7 @@ AC_OUTPUT( plugins/enttec/Makefile plugins/giop/Makefile plugins/gryphon/Makefile + plugins/h223/Makefile plugins/irda/Makefile plugins/lwres/Makefile plugins/mate/Makefile diff --git a/epan/libethereal.def b/epan/libethereal.def index 5114395919..6a4f67e46b 100644 --- a/epan/libethereal.def +++ b/epan/libethereal.def @@ -332,6 +332,8 @@ gsm_a_dtap_msg_ss_strings DATA gsm_a_pd_str DATA gsm_map_opr_code_strings DATA g_resolv_flags DATA +h245_set_h223_add_lc_handle +h245_set_h223_set_mc_handle have_tap_listeners heur_dissector_add hex_str_to_bytes diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index fb10959767..38776025fa 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -74,6 +74,7 @@ PLUGINS=../../plugins/acn/acn.dll \ ../../plugins/giop/parlay.dll \ ../../plugins/giop/tango.dll \ ../../plugins/gryphon/gryphon.dll \ + ../../plugins/h223/h223.dll \ ../../plugins/irda/irda.dll \ ../../plugins/lwres/lwres.dll \ ../../plugins/mate/mate.dll \ diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index d590e92a5f..e9750a41f2 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -676,6 +676,7 @@ File "..\..\plugins\giop\cosnaming.dll" File "..\..\plugins\giop\parlay.dll" File "..\..\plugins\giop\tango.dll" File "..\..\plugins\gryphon\gryphon.dll" +File "..\..\plugins\h223\h223.dll" File "..\..\plugins\irda\irda.dll" File "..\..\plugins\lwres\lwres.dll" File "..\..\plugins\megaco\megaco.dll" diff --git a/plugins/Makefile.am b/plugins/Makefile.am index e4c4da5825..5ba7ff100a 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -31,6 +31,7 @@ SUBDIRS = \ enttec \ giop \ gryphon \ + h223 \ irda \ lwres \ mate \ diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake index 8e141c105c..f8a74381ab 100644 --- a/plugins/Makefile.nmake +++ b/plugins/Makefile.nmake @@ -16,6 +16,7 @@ all: \ enttec \ giop \ gryphon \ + h223 \ irda \ lwres \ mate \ @@ -77,6 +78,11 @@ gryphon:: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. +h223:: + cd h223 + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake + cd .. + irda:: cd irda $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake @@ -166,6 +172,8 @@ clean: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../gryphon $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean + cd ../h223 + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../irda $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../lwres @@ -215,6 +223,8 @@ distclean: clean $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../gryphon $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean + cd ../h223 + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../irda $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../lwres @@ -264,6 +274,8 @@ maintainer-clean: distclean $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../gryphon $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../h223 + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintaner-clean cd ../irda $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../lwres @@ -310,6 +322,7 @@ install-plugins: xcopy enttec\*.dll $(VERSION) /d xcopy giop\*.dll $(VERSION) /d xcopy gryphon\*.dll $(VERSION) /d + xcopy h223\*.dll $(VERSION) /d xcopy irda\*.dll $(VERSION) /d xcopy lwres\*.dll $(VERSION) /d xcopy mate\*.dll $(VERSION) /d |