New directories, new cleanup.

SCCS-vsn: usr.bin/tn3270/ascii/makefile 1.8
SCCS-vsn: usr.bin/tn3270/ctlr/makefile 1.11
SCCS-vsn: usr.bin/tn3270/general/makefile 1.9
SCCS-vsn: usr.bin/tn3270/sys_curses/makefile 1.7
SCCS-vsn: usr.bin/tn3270/distribution/arpa/makefile 1.3
SCCS-vsn: usr.bin/tn3270/distribution/sys_dos/makefile 1.6
SCCS-vsn: usr.bin/tn3270/tools/makefile 1.11
SCCS-vsn: usr.bin/tn3270/distribution/utilities/makefile 1.2

diff --git a/usr/src/usr.bin/tn3270/ascii/makefile b/usr/src/usr.bin/tn3270/ascii/makefile
index c0cc232..586b00d 100644 (file)
--- a/usr/src/usr.bin/tn3270/ascii/makefile
+++ b/usr/src/usr.bin/tn3270/ascii/makefile
@@ -18,12 +18,12 @@ KBD = unix.kbd
 
 
 # The source files...
 
 
 # The source files...

-ALLH = ascebc.h astosc.h disp_asc.h map3270.ext state.h termin.ext
+ALLH = map3270.ext state.h termin.ext

 
 

-ALLC = asctab.c astosc.c ebctab.c map3270.c mset.c termin.c
+ALLC = map3270.c mset.c termin.c

 
 # We don't include mset.o here...
 
 # We don't include mset.o here...

-ALLO   = astosc.o map3270.o termin.o asctab.o ebctab.o disp_asc.o
+ALLO   = map3270.o termin.o

 
 ALLPRINT = default.map ${ALLH} ${ALLC}
 
 
 ALLPRINT = default.map ${ALLH} ${ALLC}
 


@@ -32,17 +32,18 @@ ALLSOURCE = ${ALLPRINT} makefile makefile.mak
 .s.o:
        /lib/cpp -E $< | as -o $@
 
 .s.o:
        /lib/cpp -E $< | as -o $@
 

-ascii.lib:     $(ALLO)
-       ar cr ascii.lib $(ALLO)
-       ranlib ascii.lib
+asciilib.a:    $(ALLO)
+       ar cr asciilib.a $(ALLO)
+       ranlib asciilib.a

 
 clean:
 
 clean:

-       rm -f $(ALLO) astosc.out disp_asc.out asc_disp.out \
-                               errs makefile.bak ascii.lib
+       rm -f $(ALLO) errs makefile.bak asciilib.a
+       -sccs clean
+       -sccs get makefile

 
 sourcelist:    ${ALLSOURCE}
        @for i in ${ALLSOURCE}; \
 
 sourcelist:    ${ALLSOURCE}
        @for i in ${ALLSOURCE}; \

-               do (echo ${DIRPATH}/$$i); done
+               do (echo ${DIRPATH}$$i); done

 
 print:
        ${PRINT} ${ALLPRINT}
 
 print:
        ${PRINT} ${ALLPRINT}


@@ -59,29 +60,6 @@ lint:
 .DEFAULT:
        sccs get $<
 
 .DEFAULT:
        sccs get $<
 

-astosc.out:    ../ctlr/function.h ../ctlr/hostctlr.h ../ctlr/$(KBD)
-       (cd ../tools; make mkastosc $(MFLAGS) )
-       -/bin/rm $@
-       ../tools/mkastosc < ../ctlr/$(KBD) > $@
-
-asc_disp.out:  ../ctlr/ebc_disp.o
-       (cd ../tools; make mkastods $(MFLAGS) )
-       -/bin/rm $@
-       ../tools/mkastods > $@
-
-disp_asc.out:  ../ctlr/ebc_disp.o
-       (cd ../tools; make mkdstoas $(MFLAGS) )
-       -/bin/rm $@
-       ../tools/mkdstoas > $@
-
-disp_asc.o:    disp_asc.h asc_disp.out disp_asc.out
-       -/bin/rm $@ TMPfunc.c
-       /bin/echo \#include \"disp_asc.h\" > TMPfunc.c
-       /bin/echo \#include \"asc_disp.out\" >> TMPfunc.c
-       /bin/echo \#include \"disp_asc.out\" >> TMPfunc.c
-       $(CC) $(CFLAGS) -c TMPfunc.c
-       -/bin/mv TMPfunc.o $@
-

 depend:
        grep '^#include' ${ALLC} | grep -v '<' | \
        sed -e 's/:[^"]*"\([^"]*\)".*/: \1/' \
 depend:
        grep '^#include' ${ALLC} | grep -v '<' | \
        sed -e 's/:[^"]*"\([^"]*\)".*/: \1/' \


@@ -100,10 +78,9 @@ depend:
 
 # DO NOT DELETE THIS LINE
 
 
 # DO NOT DELETE THIS LINE
 

-astosc.o: ../general/general.h ../ctlr/function.h astosc.h state.h astosc.out

 map3270.o: state.h ../general/globals.h map3270.ext default.map
 map3270.o: state.h ../general/globals.h map3270.ext default.map

+mset.o: ../ctlr/function.h state.h ../apilib/astosc.h ../general/globals.h
+mset.o: map3270.ext

 termin.o: ../general/general.h ../ctlr/function.h ../ctlr/inbound.ext
 termin.o: ../general/general.h ../ctlr/function.h ../ctlr/inbound.ext

-termin.o: ../ctlr/outbound.ext ../telnet.ext termin.ext astosc.h state.h
-termin.o: ../general/globals.h
-asctab.o: ascebc.h
-ebctab.o: ascebc.h
+termin.o: ../ctlr/outbound.ext ../telnet.ext termin.ext ../apilib/astosc.h
+termin.o: state.h ../general/globals.h

diff --git a/usr/src/usr.bin/tn3270/ctlr/makefile b/usr/src/usr.bin/tn3270/ctlr/makefile
index 1f2c93a..8a2b593 100644 (file)
--- a/usr/src/usr.bin/tn3270/ctlr/makefile
+++ b/usr/src/usr.bin/tn3270/ctlr/makefile
@@ -19,12 +19,12 @@ KBD = 3270pc.kbd
 KBD    = unix.kbd
 
 # The source files...
 KBD    = unix.kbd
 
 # The source files...

-ALLH = dctype.h ebc_disp.h function.h hostctlr.h inbound.ext oia.h \
+ALLH = function.h hostctlr.h inbound.ext oia.h \

        options.ext options.h outbound.ext screen.h scrnctlr.h
 
        options.ext options.h outbound.ext screen.h scrnctlr.h
 

-ALLC = dctype.c ebc_disp.c inbound.c oia.c options.c outbound.c
+ALLC = inbound.c oia.c options.c outbound.c

 
 

-ALLO = dctype.o ebc_disp.o inbound.o oia.o options.o outbound.o
+ALLO = inbound.o oia.o options.o outbound.o

 
 ALLPRINT =     3180.kbd 3270pc.kbd unix.kbd ${ALLH} ${ALLC}
 
 
 ALLPRINT =     3180.kbd 3270pc.kbd unix.kbd ${ALLH} ${ALLC}
 


@@ -33,17 +33,19 @@ ALLSOURCE = ${ALLPRINT} makefile makefile.mak
 .s.o:
        /lib/cpp -E $< | as -o $@
 
 .s.o:
        /lib/cpp -E $< | as -o $@
 

-ctlr.lib:      ${ALLO}
-       ar cr ctlr.lib ${ALLO}
-       ranlib ctlr.lib
+ctlrlib.a:     ${ALLO}
+       ar cr ctlrlib.a ${ALLO}
+       ranlib ctlrlib.a

 
 clean:
 
 clean:

-       rm -f $(ALLO) mset tn3270 prt3270 m4.out errs makefile.bak ctlr.lib
+       rm -f $(ALLO) mset tn3270 prt3270 m4.out errs makefile.bak ctlrlib.a

        rm -f kbd.out TMPfunc.out TMPfunc.c
        rm -f kbd.out TMPfunc.out TMPfunc.c

+       -sccs clean
+       -sccs get makefile

 
 sourcelist:    ${ALLSOURCE}
        @for i in ${ALLSOURCE}; \
 
 sourcelist:    ${ALLSOURCE}
        @for i in ${ALLSOURCE}; \

-               do (echo ${DIRPATH}/$$i); done
+               do (echo ${DIRPATH}$$i); done

 
 print:
        ${PRINT} ${ALLPRINT}
 
 print:
        ${PRINT} ${ALLPRINT}


@@ -62,11 +64,11 @@ lint:
 
 kbd.out:       $(KBD) hostctlr.h
        (cd ../tools; make mkhits $(MFLAGS) )
 
 kbd.out:       $(KBD) hostctlr.h
        (cd ../tools; make mkhits $(MFLAGS) )

-       -/bin/rm $@ TMPfunc.out TMPfunc.c
+       -/bin/rm -f $@ TMPfunc.out TMPfunc.c

        /bin/echo \#include \"function.h\" > TMPfunc.c
        $(CC) $(CFLAGS) -E TMPfunc.c > TMPfunc.out
        ../tools/mkhits - ../ctlr/TMPfunc.out < $(KBD) > $@
        /bin/echo \#include \"function.h\" > TMPfunc.c
        $(CC) $(CFLAGS) -E TMPfunc.c > TMPfunc.out
        ../tools/mkhits - ../ctlr/TMPfunc.out < $(KBD) > $@

-       -/bin/rm TMPfunc.out TMPfunc.c
+       -/bin/rm -f TMPfunc.out TMPfunc.c

 
 depend:
        grep '^#include' ${ALLC} | grep -v '<' | \
 
 depend:
        grep '^#include' ${ALLC} | grep -v '<' | \


@@ -86,12 +88,11 @@ depend:
 
 # DO NOT DELETE THIS LINE
 
 
 # DO NOT DELETE THIS LINE
 

-dctype.o: dctype.h

 inbound.o: ../general/general.h function.h hostctlr.h oia.h scrnctlr.h screen.h
 inbound.o: ../general/general.h function.h hostctlr.h oia.h scrnctlr.h screen.h

-inbound.o: options.h dctype.h ebc_disp.h ../general/globals.h inbound.ext
-inbound.o: outbound.ext ../telnet.ext kbd.out
+inbound.o: options.h ../apilib/dctype.h ../apilib/ebc_disp.h
+inbound.o: ../general/globals.h inbound.ext outbound.ext ../telnet.ext kbd.out

 oia.o: ../general/general.h oia.h ../general/globals.h
 options.o: options.h ../general/globals.h options.ext
 oia.o: ../general/general.h oia.h ../general/globals.h
 options.o: options.h ../general/globals.h options.ext

-outbound.o: ../general/general.h hostctlr.h oia.h screen.h ebc_disp.h
+outbound.o: ../general/general.h hostctlr.h oia.h screen.h ../apilib/ebc_disp.h

 outbound.o: ../general/globals.h options.ext ../telnet.ext inbound.ext
 outbound.o: outbound.ext ../general/bsubs.ext
 outbound.o: ../general/globals.h options.ext ../telnet.ext inbound.ext
 outbound.o: outbound.ext ../general/bsubs.ext

diff --git a/usr/src/usr.bin/tn3270/distribution/arpa/makefile b/usr/src/usr.bin/tn3270/distribution/arpa/makefile
index 1cdbce9..26ddc6a 100644 (file)
--- a/usr/src/usr.bin/tn3270/distribution/arpa/makefile
+++ b/usr/src/usr.bin/tn3270/distribution/arpa/makefile
@@ -8,7 +8,8 @@ ALLPRINT = ${ALLH} ${ALLC}
 ALLSOURCE = ${ALLPRINT} makefile makefile.mak
 
 clean:
 ALLSOURCE = ${ALLPRINT} makefile makefile.mak
 
 clean:

-
+       -sccs clean
+       -sccs get makefile

 
 action:
        ${ACTION}
 
 action:
        ${ACTION}


@@ -19,7 +20,7 @@ print:
 
 sourcelist:    ${ALLSOURCE}
        @for i in ${ALLSOURCE}; \
 
 sourcelist:    ${ALLSOURCE}
        @for i in ${ALLSOURCE}; \

-               do (echo ${DIRPATH}/$$i); done
+               do (echo ${DIRPATH}$$i); done

 
 .DEFAULT:
        sccs get $<
 
 .DEFAULT:
        sccs get $<

diff --git a/usr/src/usr.bin/tn3270/distribution/sys_dos/makefile b/usr/src/usr.bin/tn3270/distribution/sys_dos/makefile
index 39b21cf..620a8cb 100644 (file)
--- a/usr/src/usr.bin/tn3270/distribution/sys_dos/makefile
+++ b/usr/src/usr.bin/tn3270/distribution/sys_dos/makefile
@@ -31,10 +31,12 @@ screenlib:  $(ALLO)
 
 clean:
        rm -f $(ALLO) errs makefile.bak screenlib
 
 clean:
        rm -f $(ALLO) errs makefile.bak screenlib

+       -sccs clean
+       -sccs get makefile

 
 sourcelist:    ${ALLSOURCE}
        @for i in ${ALLSOURCE}; \
 
 sourcelist:    ${ALLSOURCE}
        @for i in ${ALLSOURCE}; \

-               do (echo ${DIRPATH}/$$i); done
+               do (echo ${DIRPATH}$$i); done

 
 print:
        ${PRINT} ${ALLPRINT}
 
 print:
        ${PRINT} ${ALLPRINT}

diff --git a/usr/src/usr.bin/tn3270/distribution/utilities/makefile b/usr/src/usr.bin/tn3270/distribution/utilities/makefile
index cbc2265..599eb6e 100644 (file)
--- a/usr/src/usr.bin/tn3270/distribution/utilities/makefile
+++ b/usr/src/usr.bin/tn3270/distribution/utilities/makefile
@@ -20,8 +20,8 @@ tnrecv:       tnrecv.o
        ${CC} ${CFLAGS} -o $@ tnrecv.o ../apilib/apilib.a
 
 clean:
        ${CC} ${CFLAGS} -o $@ tnrecv.o ../apilib/apilib.a
 
 clean:

-       -/bin/rm ${ALLO} errs
-       sccs clean
+       -/bin/rm -f makefile.bak ${ALLO} errs
+       -sccs clean

        -sccs get makefile
 
 action:
        -sccs get makefile
 
 action:


@@ -32,7 +32,7 @@ print:
 
 sourcelist:    ${ALLSOURCE}
        @for i in ${ALLSOURCE}; \
 
 sourcelist:    ${ALLSOURCE}
        @for i in ${ALLSOURCE}; \

-               do (echo ${DIRPATH}/$$i); done
+               do (echo ${DIRPATH}$$i); done

 
 depend:
        grep '^#include' ${ALLC} | grep -v '<' | \
 
 depend:
        grep '^#include' ${ALLC} | grep -v '<' | \

diff --git a/usr/src/usr.bin/tn3270/general/makefile b/usr/src/usr.bin/tn3270/general/makefile
index 2f782a2..15c3926 100644 (file)
--- a/usr/src/usr.bin/tn3270/general/makefile
+++ b/usr/src/usr.bin/tn3270/general/makefile
@@ -52,16 +52,18 @@ ALLO        = globals.o ${SUBSO}
 .s.o:
        /lib/cpp -E $< | as -o $@
 
 .s.o:
        /lib/cpp -E $< | as -o $@
 

-general.lib:   ${ALLO}
-       ar cr general.lib ${ALLO}
-       ranlib general.lib
+generallib.a:  ${ALLO}
+       ar cr generallib.a ${ALLO}
+       ranlib generallib.a

 
 clean:
 
 clean:

-       rm -f $(ALLO) errs makefile.bak general.lib
+       rm -f $(ALLO) errs makefile.bak generallib.a
+       -sccs clean
+       -sccs get makefile

 
 sourcelist:    ${ALLSOURCE}
        @for i in ${ALLSOURCE}; \
 
 sourcelist:    ${ALLSOURCE}
        @for i in ${ALLSOURCE}; \

-               do (echo ${DIRPATH}/$$i); done
+               do (echo ${DIRPATH}$$i); done

 
 print:
        ${PRINT} ${ALLPRINT}
 
 print:
        ${PRINT} ${ALLPRINT}


@@ -96,6 +98,5 @@ depend:
 
 # DO NOT DELETE THIS LINE
 
 
 # DO NOT DELETE THIS LINE
 

-globals.o: ../ctlr/hostctlr.h ../ascii/ascebc.h ../ctlr/dctype.h
-globals.o: ../ctlr/options.h ../ctlr/screen.h ../ascii/state.h globals.h
-globals.o: ../general/general.h
+globals.o: ../ctlr/hostctlr.h ../ctlr/oia.h ../ctlr/options.h ../ctlr/screen.h
+globals.o: globals.h ../general/general.h

diff --git a/usr/src/usr.bin/tn3270/sys_curses/makefile b/usr/src/usr.bin/tn3270/sys_curses/makefile
index dfd9aa0..389bb7a 100644 (file)
--- a/usr/src/usr.bin/tn3270/sys_curses/makefile
+++ b/usr/src/usr.bin/tn3270/sys_curses/makefile
@@ -23,16 +23,18 @@ ALLPRINT =  ${ALLH} ${ALLC}
 
 ALLSOURCE =    ${ALLPRINT} makefile
 
 
 ALLSOURCE =    ${ALLPRINT} makefile
 

-sys.lib:       $(ALLO)
-       ar cr sys.lib $(ALLO)
-       ranlib sys.lib
+syslib.a:      $(ALLO)
+       ar cr syslib.a $(ALLO)
+       ranlib syslib.a

 
 clean:
 
 clean:

-       rm -f $(ALLO) errs makefile.bak sys.lib
+       rm -f $(ALLO) errs makefile.bak syslib.a
+       -sccs clean
+       -sccs get makefile

 
 sourcelist:    ${ALLSOURCE}
        @for i in ${ALLSOURCE}; \
 
 sourcelist:    ${ALLSOURCE}
        @for i in ${ALLSOURCE}; \

-               do (echo ${DIRPATH}/$$i); done
+               do (echo ${DIRPATH}$$i); done

 
 print:
        ${PRINT} ${ALLPRINT}
 
 print:
        ${PRINT} ${ALLPRINT}


@@ -71,7 +73,7 @@ depend:
 
 system.o: ../general/general.h ../api/api.h ../apilib/api_exch.h
 system.o: ../general/globals.h
 
 system.o: ../general/general.h ../api/api.h ../apilib/api_exch.h
 system.o: ../general/globals.h

-termout.o: ../general/general.h terminal.h ../telnet.ext ../ascii/disp_asc.h
+termout.o: ../general/general.h terminal.h ../telnet.ext ../apilib/disp_asc.h

 termout.o: ../ctlr/hostctlr.h ../ctlr/inbound.ext ../ctlr/oia.h
 termout.o: ../ctlr/options.ext ../ctlr/outbound.ext ../ctlr/screen.h
 termout.o: ../ascii/map3270.ext ../general/globals.h
 termout.o: ../ctlr/hostctlr.h ../ctlr/inbound.ext ../ctlr/oia.h
 termout.o: ../ctlr/options.ext ../ctlr/outbound.ext ../ctlr/screen.h
 termout.o: ../ascii/map3270.ext ../general/globals.h

diff --git a/usr/src/usr.bin/tn3270/tools/makefile b/usr/src/usr.bin/tn3270/tools/makefile
index 85a419a..afd2af5 100644 (file)
--- a/usr/src/usr.bin/tn3270/tools/makefile
+++ b/usr/src/usr.bin/tn3270/tools/makefile
@@ -72,7 +72,7 @@ mkdctype:     mkdctype.o ../apilib/ebc_disp.o ectype.o
 
 sourcelist:    ${ALLSOURCE}
        @for i in ${ALLSOURCE}; \
 
 sourcelist:    ${ALLSOURCE}
        @for i in ${ALLSOURCE}; \

-               do (echo ${DIRPATH}/$$i); done
+               do (echo ${DIRPATH}$$i); done

 
 print:
        ${PRINT} ${ALLPRINT}
 
 print:
        ${PRINT} ${ALLPRINT}


@@ -84,8 +84,8 @@ action:
        ${ACTION}
 
 clean:
        ${ACTION}
 
 clean:

-       -rm errs makefile.bak ${ALLO} ${ALLEXE}
-       sccs clean
+       -rm -f errs makefile.bak ${ALLO} ${ALLEXE}
+       -sccs clean

        -sccs get makefile
 
 lint:
        -sccs get makefile
 
 lint: