Rename all of the ascend files:

That way we hopefully won't need the runlex.sh hack any
more. Also the ylwrap stuff is (hopefully) obsolete.

ascend.[hc]      -> ascendtext.[hc]
ascend-scanner.l -> ascend_scanner.l
ascend-grammar.y -> ascend.y


svn path=/trunk/; revision=28744

10 files changed, 51 insertions, 47 deletions

diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 038a860d90..80b334ad45 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -25,7 +25,7 @@
 set(WIRETAP_FILES
 	5views.c
 	airopeek9.c
-	ascend.c
+	ascendtext.c
 	atm.c
 	ber.c
 	btsnoop.c
@@ -51,6 +51,7 @@ set(WIRETAP_FILES
 	libpcap.c
 	mpeg.c
 	netmon.c
+	netscaler.c
 	netscreen.c
 	nettl.c
 	network_instruments.c
@@ -62,23 +63,26 @@ set(WIRETAP_FILES
 	pppdump.c
 	radcom.c
 	snoop.c
+	tnef.c
 	toshiba.c
 	visual.c
 	vms.c
 	wtap.c
 )
 
-ADD_LEX_FILES(WIRETAP_FILES
-	ascend-scanner.l
+add_lex_files(WIRETAP_FILES
+	ascend_scanner.l
 	k12text.l
 )
 
-ADD_YACC_FILES(WIRETAP_FILES
-	ascend-grammar.y
+add_yacc_files(WIRETAP_FILES
+	ascend.y
 )
 
-ADD_LIBRARY(wiretap SHARED 
+# add_dependency(ascend.c ascend_scanner_lex.h)
+
+add_library(wiretap SHARED 
 	${WIRETAP_FILES}
 )
 
-INSTALL(TARGETS wiretap LIBRARY DESTINATION lib)
+install(TARGETS wiretap LIBRARY DESTINATION lib)
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 17ed580b1d..c431e6cc11 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -72,16 +72,16 @@ libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsut
 
 RUNLEX = $(top_srcdir)/tools/runlex.sh
 
-ascend-scanner_lex.h : ascend-scanner.c
+ascend_scanner_lex.h : ascend_scanner.c
 
 k12text_lex.h : k12text.c
 
-ascend-grammar.c ascend-grammar.h: ascend-grammar.y
+ascend.c ascend.h: ascend.y
 	@if [ -z "$(YACC)" ]; then \
 		echo "Neither bison nor byacc has been found"; \
 		exit 1; \
 	fi
-	$(YACC) -d -p ascend -o ascend-grammar.c $(srcdir)/ascend-grammar.y
+	$(YACC) -d -p ascend -o ascend.c $(srcdir)/ascend.y
 
 checkapi:
 	$(PERL) ../tools/checkAPIs.pl -g abort -g termoutput $(NONGENERATED_C_FILES) $(GENERATOR_FILES)
diff --git a/wiretap/Makefile.common b/wiretap/Makefile.common
index 966314fedd..d6e3f40120 100644
--- a/wiretap/Makefile.common
+++ b/wiretap/Makefile.common
@@ -31,7 +31,7 @@
 NONGENERATED_C_FILES = \
 	5views.c		\
 	airopeek9.c		\
-	ascend.c		\
+	ascendtext.c		\
 	atm.c			\
 	ber.c			\
 	btsnoop.c		\
@@ -57,8 +57,8 @@ NONGENERATED_C_FILES = \
 	libpcap.c		\
 	mpeg.c			\
 	netmon.c		\
-	netscreen.c		\
 	netscaler.c		\
+	netscreen.c		\
 	nettl.c			\
 	network_instruments.c	\
 	netxray.c		\
@@ -79,7 +79,7 @@ NONGENERATED_C_FILES = \
 NONGENERATED_HEADER_FILES = \
 	5views.h		\
 	airopeek9.h		\
-	ascend.h		\
+	ascendtext.h		\
 	ascend-int.h		\
 	atm.h			\
 	ber.h			\
@@ -127,20 +127,20 @@ NONGENERATED_HEADER_FILES = \
 
 # Files that generate compileable files
 GENERATOR_FILES = \
-       ascend-grammar.y        \
-       ascend-scanner.l \
+       ascend.y        \
+       ascend_scanner.l \
        k12text.l
 
 # The C source files they generate.
 GENERATED_C_FILES = \
-	ascend-grammar.c	\
-	ascend-scanner.c 	\
+	ascend.c	\
+	ascend_scanner.c 	\
 	k12text.c
 
 # The header files that they generate.
 GENERATED_HEADER_FILES = \
-	ascend-grammar.h	\
-	ascend-scanner_lex.h	\
+	ascend.h	\
+	ascend_scanner_lex.h	\
 	k12text_lex.h
 
 # All the generated files.
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index 9d111a09f1..456d7a9ed5 100644
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -41,16 +41,16 @@ wiretap-$(WTAP_VERSION).dll : $(OBJECTS) wtap.def ..\image\wiretap.res
 
 RUNLEX = ..\tools\runlex.sh
 
-ascend-scanner_lex.h : ascend-scanner.c
-ascend-scanner.obj : ascend-scanner.c ascend-grammar.h
-	$(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -c ascend-scanner.c
+ascend_scanner_lex.h : ascend_scanner.c
+ascend_scanner.obj : ascend_scanner.c ascend.h
+	$(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -c ascend_scanner.c
 
 k12text_lex.h : k12text.c
 k12text.obj : k12text.c
 	$(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -c $?
 
-ascend-grammar.c ascend-grammar.h : ascend-grammar.y
-	$(YACC) $(YACC_OPTS) -d -p ascend ascend-grammar.y -o ascend-grammar.c
+ascend.c ascend.h : ascend.y
+	$(YACC) $(YACC_OPTS) -d -p ascend ascend.y -o ascend.c
 
 clean :
 	rm -f $(OBJECTS) \
@@ -62,11 +62,11 @@ clean :
 
 #
 # We remove the generated files with "distclean" because one of them,
-# "ascend-scanner.c", needs different #includes for UN*X and Windows
+# "ascend_scanner.c", needs different #includes for UN*X and Windows
 # (UN*X versions of Flex make it include <unistd.h>, but that's a
 # UN*X-only header), so if you're going to build from source, you need
-# to build "ascend-scanner.c" from "ascend-scanner.l" with Flex.
-# This might not be necessary for "ascend-grammar.{c,h}", but as
+# to build "ascend_scanner.c" from "ascend_scanner.l" with Flex.
+# This might not be necessary for "ascend.{c,h}", but as
 # long as you need Flex, you might as well get Bison....
 #
 distclean: clean
diff --git a/wiretap/ascend-grammar.y b/wiretap/ascend.y
index c842e24553..e1ad3dc1df 100644
--- a/wiretap/ascend-grammar.y
+++ b/wiretap/ascend.y
@@ -1,5 +1,5 @@
 %{
-/* ascend-grammar.y
+/* ascend.y
  *
  * $Id$
  *
@@ -138,7 +138,7 @@ XMIT-Max7:20: (task "_brouterControlTask" at 0xb094ac20, time: 1481.51) 20 octet
 
 #include "wtap-int.h"
 #include "buffer.h"
-#include "ascend.h"
+#include "ascendtext.h"
 #include "ascend-int.h"
 #include "file_wrappers.h"
 
@@ -276,7 +276,7 @@ wds_hdr: wds_prefix string decnum KEYWORD hexnum KEYWORD decnum decnum decnum KE
   secs = $7;
   usecs = $8;
   if (pseudo_header != NULL) {
-    /* pseudo_header->user is set in ascend-scanner.l */
+    /* pseudo_header->user is set in ascend_scanner.l */
     pseudo_header->type = $1;
     pseudo_header->sess = $3;
     pseudo_header->call_num[0] = '\0';
@@ -294,7 +294,7 @@ wds8_hdr: wds_prefix string decnum KEYWORD string KEYWORD hexnum KEYWORD decnum
   secs = $9;
   usecs = $10;
   if (pseudo_header != NULL) {
-    /* pseudo_header->user is set in ascend-scanner.l */
+    /* pseudo_header->user is set in ascend_scanner.l */
     pseudo_header->type = $1;
     pseudo_header->sess = $3;
     pseudo_header->call_num[0] = '\0';
@@ -312,7 +312,7 @@ wdp7_hdr: wds_prefix decnum KEYWORD hexnum KEYWORD decnum decnum decnum KEYWORD
   secs = $6;
   usecs = $7;
   if (pseudo_header != NULL) {
-    /* pseudo_header->user is set in ascend-scanner.l */
+    /* pseudo_header->user is set in ascend_scanner.l */
     pseudo_header->type = $1;
     pseudo_header->sess = $2;
     pseudo_header->call_num[0] = '\0';
@@ -330,7 +330,7 @@ wdp8_hdr: wds_prefix decnum KEYWORD string KEYWORD hexnum KEYWORD decnum decnum
   secs = $8;
   usecs = $9;
   if (pseudo_header != NULL) {
-    /* pseudo_header->user is set in ascend-scanner.l */
+    /* pseudo_header->user is set in ascend_scanner.l */
     pseudo_header->type = $1;
     pseudo_header->sess = $2;
     pseudo_header->call_num[0] = '\0';
@@ -375,7 +375,7 @@ wdd_hdr: WDD_CHUNK hexnum KEYWORD KEYWORD hexnum KEYWORD decnum decnum decnum KE
   secs = $7;
   usecs = $8;
   if (pseudo_header != NULL) {
-    /* pseudo_header->call_num is set in ascend-scanner.l */
+    /* pseudo_header->call_num is set in ascend_scanner.l */
     pseudo_header->type = ASCEND_PFX_WDD;
     pseudo_header->user[0] = '\0';
     pseudo_header->sess = 0;
diff --git a/wiretap/ascend-scanner.l b/wiretap/ascend_scanner.l
index 59908aea6b..e669db287e 100644
--- a/wiretap/ascend-scanner.l
+++ b/wiretap/ascend_scanner.l
@@ -10,7 +10,7 @@
 %option prefix="ascend"
 
 %{
-/* ascend-scanner.l
+/* ascend_scanner.l
  *
  * $Id$
  *
@@ -45,11 +45,11 @@
 #endif
 
 #include "wtap-int.h"
+#include "ascendtext.h"
 #include "ascend.h"
-#include "ascend-grammar.h"
 #include "ascend-int.h"
 #include "file_wrappers.h"
-#include "ascend-scanner_lex.h"
+#include "ascend_scanner_lex.h"
 
 FILE_T yy_fh;
 extern char *ascend_ra_ptr;
diff --git a/wiretap/ascend.c b/wiretap/ascendtext.c
index 17241b3968..f8597ae245 100644
--- a/wiretap/ascend.c
+++ b/wiretap/ascendtext.c
@@ -1,4 +1,4 @@
-/* ascend.c
+/* ascendtext.c
  *
  * $Id$
  *
@@ -25,7 +25,7 @@
 #endif
 #include "wtap-int.h"
 #include "buffer.h"
-#include "ascend.h"
+#include "ascendtext.h"
 #include "ascend-int.h"
 #include "file_wrappers.h"
 #include <wsutil/file_util.h>
@@ -49,7 +49,7 @@
    * wanopening, wandisplay, wannext, wandsess
 			traces PPP or other WAN connections
 
-   Please see ascend-grammar.y for examples.
+   Please see ascend.y for examples.
 
    Detailed documentation on TAOS products is at http://support.lucent.com.
 
diff --git a/wiretap/ascend.h b/wiretap/ascendtext.h
index 9e493ab36c..f2bcd7fb43 100644
--- a/wiretap/ascend.h
+++ b/wiretap/ascendtext.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef __ASCEND_H__
-#define __ASCEND_H__
+#ifndef __ASCENDTEXT_H__
+#define __ASCENDTEXT_H__
 
 #define ASCEND_MAX_DATA_ROWS 8
 #define ASCEND_MAX_DATA_COLS 16
diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index 98e06e9b18..8d431b61a7 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -47,7 +47,7 @@
 #include "airopeek9.h"
 #include "ngsniffer.h"
 #include "radcom.h"
-#include "ascend.h"
+#include "ascendtext.h"
 #include "nettl.h"
 #include "libpcap.h"
 #include "snoop.h"
diff --git a/wiretap/libwiretap.vcproj b/wiretap/libwiretap.vcproj
index 5191c74a94..9779aa6a46 100644
--- a/wiretap/libwiretap.vcproj
+++ b/wiretap/libwiretap.vcproj
@@ -72,7 +72,7 @@
 				>

 			</File>

 			<File

-				RelativePath=".\ascend.c"

+				RelativePath=".\ascendtext.c"

 				>

 			</File>

 			<File

@@ -230,7 +230,7 @@
 				>

 			</File>

 			<File

-				RelativePath=".\ascend.h"

+				RelativePath=".\ascendtext.h"

 				>

 			</File>

 			<File

@@ -379,11 +379,11 @@
 			>

 		</File>

 		<File

-			RelativePath=".\ascend-grammar.y"

+			RelativePath=".\ascend.y"

 			>

 		</File>

 		<File

-			RelativePath=".\ascend-scanner.l"

+			RelativePath=".\ascend_scanner.l"

 			>

 		</File>

 		<File