Convert to new READ_EM data structure. Build a em_nopt. Input names now O_ and output C_. Add insert part support.

modules/src/em_opt/Makefile

@@ -2,34 +2,45 @@
 EMHOME = ../../..
 INSTALL = $(EMHOME)/modules/install
 COMPARE = $(EMHOME)/modules/compare
-LIBOPT = libopt.a
+LIBDIR	= $(EMHOME)/modules/lib
+BINDIR	= $(EMHOME)/lib
+LIBOPT = libemopt.a
+
+# libraries required for standalone em_nopt
+INK	= $(LIBDIR)/libread_emk.a
+OUTK	= $(LIBDIR)/libemk.a
+SYS	= $(LIBDIR)/libsystem.a
+ALLOC	= $(LIBDIR)/liballoc.a $(LIBDIR)/malloc.o
+DATA	= $(EMHOME)/lib/em_data.a
+LIBS	= $(INK) $(OUTK) $(ALLOC) $(DATA) $(SYS)
 
 # set HOWMUCH to head -20 to limit number of patterns used
-#HOWMUCH = head -20
-HOWMUCH = cat
+#HOWMUCH= head -20
+HOWMUCH	= cat
+
+LEXLIB	= -ll
+INCLDIR	= -I$(EMHOME)/h -I$(EMHOME)/modules/h -I$(EMHOME)/modules/pkg
+PREFLAGS= $(INCLDIR) -DPRIVATE=static#	 -DDEBUG
 
-LEXLIB = -ll
-INCLDIR = -I$(EMHOME)/h -I$(EMHOME)/modules/h -I$(EMHOME)/modules/pkg
-PREFLAGS = $(INCLDIR) -DPRIVATE=static
 # Enable the next line to produce a version that output's the line number
 # from the patterns file each time an optimization is performed.
-#PREFLAG = $(PREFLAGS) -DSTATS
-PROFFLAG = -O
-CFLAGS = $(PREFLAGS) $(PROFFLAG)
-LLOPT =
-CMD = '$(CC) -c $(CFLAGS)'
+#PREFLAGS= $(PREFLAGS) -DSTATS
+PROFFLAG= -O
+CFLAGS	= $(PREFLAGS) $(PROFFLAG) -J
+LLOPT	=
+CMD	= '$(CC) -c $(CFLAGS)'
 
 .SUFFIXES:	.d .r
 
 .r.d:; CMD=$(CMD); export CMD; awk -f makefuns.awk $*.r | sh
 		touch $@
 
-CSRC = nopt.c aux.c mkcalls.c outputdfa.c outcalls.c\
+CSRC = main.c nopt.c mkstrct.c aux.c outputdfa.c outcalls.c\
 		findworst.c initlex.c
 
 SRCS = Makefile nopt.h parser.h parser.g syntax.l pseudo.r patterns $(CSRC)
 
-NOFILES = nopt.o dfa.o trans.o aux.o mkcalls.o
+NOFILES = nopt.o dfa.o trans.o aux.o
 
 POFILES = parser.o syntax.o outputdfa.o outcalls.o findworst.o initlex.o Lpars.o
 
@@ -37,10 +48,11 @@ GENFILES = Lpars.h Lpars.c parserdummy parser.c syntax.c dfadummy\
 		dfa.c dfa.c.save trans.c trans.c.save incalls.d incalls.r\
 		incalls.r.save pseudo.d
 
-all:		$(LIBOPT)
+all:		em_nopt $(LIBOPT)
 
 install:	all
 		$(INSTALL) lib/$(LIBOPT)
+		cp em_nopt $(BINDIR)
 
 cmp:		all
 		$(COMPARE) lib/$(LIBOPT)
@@ -52,13 +64,17 @@ opr:
 		make pr | opr
 
 clean:
-		rm -f C_*.o
-		rm -f C_*.c
-		rm -f $(NOFILES) $(POFILES) $(GENFILES) parser libopt.a
+		rm -f O_*.o
+		rm -f O_*.c
+		rm -f $(NOFILES) main.o mkstrct.o $(POFILES)
+		rm -f $(GENFILES) parser libopt.a
 
-$(LIBOPT):	dfadummy $(NOFILES) pseudo.d incalls.d
+em_nopt:	main.o $(NOFILES)
+		$(CC) -o em_nopt main.o $(NOFILES) $(LIBS)
+
+$(LIBOPT):	$(NOFILES) mkstrct.o pseudo.d incalls.d
 		rm -f $(LIBOPT)
-		ar rc $(LIBOPT) C_*.o $(NOFILES)
+		ar rc $(LIBOPT) O_*.o $(NOFILES) mkstrct.o
 		-sh -c 'ranlib $(LIBOPT)'
 
 dfadummy:	patterns parser
@@ -76,7 +92,6 @@ dfadummy:	patterns parser
 # How to build program to parse patterns table and build c files.
 
 PARSERLIB = $(EMHOME)/lib/em_data.a\
-		$(EMHOME)/modules/lib/libprint.a\
 		$(EMHOME)/modules/lib/liballoc.a\
 		$(EMHOME)/modules/lib/libstring.a\
 		$(EMHOME)/modules/lib/libsystem.a
@@ -88,13 +103,14 @@ parserdummy:	parser.g
 		LLgen $(LLOPT) parser.g
 		touch parserdummy
 
+main.o:		nopt.h
 nopt.o:		nopt.h
+mkstrct.o:	nopt.h
 aux.o:		nopt.h
-pseudo.d:	nopt.h
-mkcalls.o:	nopt.h
+pseudo.d:	nopt.h makefuns.awk
 dfa.o:		nopt.h dfadummy
 trans.o:	nopt.h dfadummy
-incalls.d:	nopt.h
+incalls.d:	nopt.h makefuns.awk
 incalls.r:	dfadummy
 
 parser.o:	Lpars.h parser.h