From 853501a452a61d03b590b5279438cdbd4b6e9a1c Mon Sep 17 00:00:00 2001 From: Luis Ontanon Date: Fri, 15 Jul 2005 21:18:32 +0000 Subject: Radius Dictionary Support Part 3: the makefiles svn path=/trunk/; revision=14926 --- Makefile.am | 132 +++++++++++++++++++++++++++++++++++++++++++- epan/Makefile.am | 3 + epan/Makefile.common | 1 + epan/Makefile.nmake | 2 + packaging/nsis/ethereal.nsi | 70 +++++++++++++++++++++++ 5 files changed, 207 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 7c7b5b2f45..e0b4465dc4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,6 +86,75 @@ diameterdir = $(pkgdatadir)/diameter diameter_DATA = dictionary.dtd dictionary.xml imscxdx.xml mobileipv4.xml \ nasreq.xml sunping.xml + +# +# Install the RADIUS directory files in the "radius" subdirectory +# of that directory. +# +radiusdir = $(pkgdatadir)/radius +radius_DATA = \ + radius/dictionary \ + radius/dictionary.3com \ + radius/dictionary.3gpp \ + radius/dictionary.3gpp2 \ + radius/dictionary.acc \ + radius/dictionary.alcatel \ + radius/dictionary.alteon \ + radius/dictionary.altiga \ + radius/dictionary.aptis \ + radius/dictionary.ascend \ + radius/dictionary.bay \ + radius/dictionary.bintec \ + radius/dictionary.bristol \ + radius/dictionary.cablelabs \ + radius/dictionary.cabletron \ + radius/dictionary.cisco \ + radius/dictionary.cisco.bbsm \ + radius/dictionary.cisco.vpn3000 \ + radius/dictionary.cisco.vpn5000 \ + radius/dictionary.colubris \ + radius/dictionary.columbia_university \ + radius/dictionary.compat \ + radius/dictionary.cosine \ + radius/dictionary.erx \ + radius/dictionary.extreme \ + radius/dictionary.foundry \ + radius/dictionary.freeradius \ + radius/dictionary.gandalf \ + radius/dictionary.garderos \ + radius/dictionary.gemtek \ + radius/dictionary.itk \ + radius/dictionary.juniper \ + radius/dictionary.karlnet \ + radius/dictionary.livingston \ + radius/dictionary.localweb \ + radius/dictionary.merit \ + radius/dictionary.microsoft \ + radius/dictionary.mikrotik \ + radius/dictionary.navini \ + radius/dictionary.netscreen \ + radius/dictionary.nokia \ + radius/dictionary.nomadix \ + radius/dictionary.propel \ + radius/dictionary.quintum \ + radius/dictionary.redback \ + radius/dictionary.redcreek \ + radius/dictionary.shasta \ + radius/dictionary.shiva \ + radius/dictionary.sonicwall \ + radius/dictionary.springtide \ + radius/dictionary.t_systems_nova \ + radius/dictionary.telebit \ + radius/dictionary.trapeze \ + radius/dictionary.tunnel \ + radius/dictionary.unisphere \ + radius/dictionary.unix \ + radius/dictionary.usr \ + radius/dictionary.valemount \ + radius/dictionary.versanet \ + radius/dictionary.wispr \ + radius/dictionary.xedia + PLATFORM_SRC = pcap-util-unix.c include Makefile.common @@ -95,7 +164,7 @@ plugin_libs = \ plugins/acn/acn.la \ plugins/agentx/agentx.la \ plugins/artnet/artnet.la \ - plugins/asn1/asn1.la \ + Plugins/asn1/asn1.la \ plugins/ciscosm/ciscosm.la \ plugins/docsis/docsis.la \ plugins/enttec/enttec.la \ @@ -547,6 +616,67 @@ EXTRA_DIST = \ nasreq.xml \ perlnoutf.pl \ print.ps \ + radius/dictionary \ + radius/dictionary.3com \ + radius/dictionary.3gpp \ + radius/dictionary.3gpp2 \ + radius/dictionary.acc \ + radius/dictionary.alcatel \ + radius/dictionary.alteon \ + radius/dictionary.altiga \ + radius/dictionary.aptis \ + radius/dictionary.ascend \ + radius/dictionary.bay \ + radius/dictionary.bintec \ + radius/dictionary.bristol \ + radius/dictionary.cablelabs \ + radius/dictionary.cabletron \ + radius/dictionary.cisco \ + radius/dictionary.cisco.bbsm \ + radius/dictionary.cisco.vpn3000 \ + radius/dictionary.cisco.vpn5000 \ + radius/dictionary.colubris \ + radius/dictionary.columbia_university \ + radius/dictionary.compat \ + radius/dictionary.cosine \ + radius/dictionary.erx \ + radius/dictionary.extreme \ + radius/dictionary.foundry \ + radius/dictionary.freeradius \ + radius/dictionary.gandalf \ + radius/dictionary.garderos \ + radius/dictionary.gemtek \ + radius/dictionary.itk \ + radius/dictionary.juniper \ + radius/dictionary.karlnet \ + radius/dictionary.livingston \ + radius/dictionary.localweb \ + radius/dictionary.merit \ + radius/dictionary.microsoft \ + radius/dictionary.mikrotik \ + radius/dictionary.navini \ + radius/dictionary.netscreen \ + radius/dictionary.nokia \ + radius/dictionary.nomadix \ + radius/dictionary.propel \ + radius/dictionary.quintum \ + radius/dictionary.redback \ + radius/dictionary.redcreek \ + radius/dictionary.shasta \ + radius/dictionary.shiva \ + radius/dictionary.sonicwall \ + radius/dictionary.springtide \ + radius/dictionary.t_systems_nova \ + radius/dictionary.telebit \ + radius/dictionary.trapeze \ + radius/dictionary.tunnel \ + radius/dictionary.unisphere \ + radius/dictionary.unix \ + radius/dictionary.usr \ + radius/dictionary.valemount \ + radius/dictionary.versanet \ + radius/dictionary.wispr \ + radius/dictionary.xedia \ randpkt.c \ rdps.c \ sunping.xml \ diff --git a/epan/Makefile.am b/epan/Makefile.am index eabb90bf11..93ee2e9b38 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -53,6 +53,7 @@ EXTRA_DIST = \ libethereal.def \ Makefile.common \ Makefile.nmake \ + radius_dict.l \ tvbtest.c \ doxygen.cfg.in @@ -73,6 +74,8 @@ libethereal_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO tvbtest: tvbtest.o tvbuff.o except.o strutil.o $(LINK) -o tvbtest tvbtest.o tvbuff.o except.o strutil.o `glib-config --libs` +radius_dict.c: radius_dict.l + $(LEX) radius_dict.l if HAVE_PLUGINS diff --git a/epan/Makefile.common b/epan/Makefile.common index d42121dc18..6b7a6e168c 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -58,6 +58,7 @@ LIBETHEREAL_SRC = \ prefs.c \ proto.c \ ptvcursor.c \ + radius_dict.c \ range.c \ reassemble.c \ req_resp_hdrs.c \ diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 20cae5121f..e8584ec513 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -141,3 +141,5 @@ mkstemp.c: ..\mkstemp.c strptime.c: ..\strptime.c xcopy ..\strptime.c . /d /y +radius_dict.c : radius_dict.l + $(LEX) radius_dict.l diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index dc781b298c..c5183d0c5d 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -296,6 +296,76 @@ File "..\..\nasreq.xml" File "..\..\sunping.xml" SetOutPath $INSTDIR + + +: +: Install the RADIUS directory files in the "radius" subdirectory +: of the installation directory. +: +SetOutPath $INSTDIR\radius +File "..\..\radius\dictionary" +File "..\..\radius\dictionary.3com" +File "..\..\radius\dictionary.3gpp" +File "..\..\radius\dictionary.3gpp2" +File "..\..\radius\dictionary.acc" +File "..\..\radius\dictionary.alcatel" +File "..\..\radius\dictionary.alteon" +File "..\..\radius\dictionary.altiga" +File "..\..\radius\dictionary.aptis" +File "..\..\radius\dictionary.ascend" +File "..\..\radius\dictionary.bay" +File "..\..\radius\dictionary.bintec" +File "..\..\radius\dictionary.bristol" +File "..\..\radius\dictionary.cablelabs" +File "..\..\radius\dictionary.cabletron" +File "..\..\radius\dictionary.cisco" +File "..\..\radius\dictionary.cisco.bbsm" +File "..\..\radius\dictionary.cisco.vpn3000" +File "..\..\radius\dictionary.cisco.vpn5000" +File "..\..\radius\dictionary.colubris" +File "..\..\radius\dictionary.columbia_university" +File "..\..\radius\dictionary.compat" +File "..\..\radius\dictionary.cosine" +File "..\..\radius\dictionary.erx" +File "..\..\radius\dictionary.extreme" +File "..\..\radius\dictionary.foundry" +File "..\..\radius\dictionary.freeradius" +File "..\..\radius\dictionary.gandalf" +File "..\..\radius\dictionary.garderos" +File "..\..\radius\dictionary.gemtek" +File "..\..\radius\dictionary.itk" +File "..\..\radius\dictionary.juniper" +File "..\..\radius\dictionary.karlnet" +File "..\..\radius\dictionary.livingston" +File "..\..\radius\dictionary.localweb" +File "..\..\radius\dictionary.merit" +File "..\..\radius\dictionary.microsoft" +File "..\..\radius\dictionary.mikrotik" +File "..\..\radius\dictionary.navini" +File "..\..\radius\dictionary.netscreen" +File "..\..\radius\dictionary.nokia" +File "..\..\radius\dictionary.nomadix" +File "..\..\radius\dictionary.propel" +File "..\..\radius\dictionary.quintum" +File "..\..\radius\dictionary.redback" +File "..\..\radius\dictionary.redcreek" +File "..\..\radius\dictionary.shasta" +File "..\..\radius\dictionary.shiva" +File "..\..\radius\dictionary.sonicwall" +File "..\..\radius\dictionary.springtide" +File "..\..\radius\dictionary.t_systems_nova" +File "..\..\radius\dictionary.telebit" +File "..\..\radius\dictionary.trapeze" +File "..\..\radius\dictionary.tunnel" +File "..\..\radius\dictionary.unisphere" +File "..\..\radius\dictionary.unix" +File "..\..\radius\dictionary.usr" +File "..\..\radius\dictionary.valemount" +File "..\..\radius\dictionary.versanet" +File "..\..\radius\dictionary.wispr" +File "..\..\radius\dictionary.xedia" +SetOutPath $INSTDIR + SetOutPath $INSTDIR\help File "..\..\help\toc" File "..\..\help\overview.txt" -- cgit v1.2.3