New directory structure

SCCS-vsn: usr.bin/tn3270/api/apilib.c 1.9
SCCS-vsn: usr.bin/tn3270/api/makefile 1.10
SCCS-vsn: usr.bin/tn3270/api/api_bsd.c 1.8
SCCS-vsn: usr.bin/tn3270/ascii/makefile 1.11
SCCS-vsn: usr.bin/tn3270/ascii/mset.c 1.7
SCCS-vsn: usr.bin/tn3270/ascii/termin.c 1.11

diff --git a/usr/src/usr.bin/tn3270/api/api_bsd.c b/usr/src/usr.bin/tn3270/api/api_bsd.c
index 527eef4..66b6a4d 100644 (file)
--- a/usr/src/usr.bin/tn3270/api/api_bsd.c
+++ b/usr/src/usr.bin/tn3270/api/api_bsd.c
@@ -6,7 +6,7 @@
 #include <netdb.h>
 #include <stdio.h>
 
 #include <netdb.h>
 #include <stdio.h>
 

-#include "../api/api.h"
+#include "../ctlr/api.h"

 #include "api_exch.h"
 
 
 #include "api_exch.h"
 
 

diff --git a/usr/src/usr.bin/tn3270/api/apilib.c b/usr/src/usr.bin/tn3270/api/apilib.c
index 9ad90cf..03de671 100644 (file)
--- a/usr/src/usr.bin/tn3270/api/apilib.c
+++ b/usr/src/usr.bin/tn3270/api/apilib.c
@@ -1,4 +1,4 @@
-#include "../api/api.h"
+#include "../ctlr/api.h"

 
 #include "apilib.h"
 
 
 #include "apilib.h"
 

diff --git a/usr/src/usr.bin/tn3270/api/makefile b/usr/src/usr.bin/tn3270/api/makefile
index f8e093e..2fda0ef 100644 (file)
--- a/usr/src/usr.bin/tn3270/api/makefile
+++ b/usr/src/usr.bin/tn3270/api/makefile
@@ -57,7 +57,7 @@ ALLO = apilib$O api_bsd$O api_exch$O astosc$O asc_ebc$O dctype$O \
 .c.obj:
        ${CC} ${CFLAGS} -c $<
 
 .c.obj:
        ${CC} ${CFLAGS} -c $<
 

-apiliblib.a: ${ALLO}
+apilib.a: ${ALLO}

        ${RM} $@
        for i in ${ALLO}; do (${AR} ${AR1} $@ ${AR2} $$i${AR3}); done
        ${RANLIB} $@
        ${RM} $@
        for i in ${ALLO}; do (${AR} ${AR1} $@ ${AR2} $$i${AR3}); done
        ${RANLIB} $@


@@ -66,7 +66,7 @@ apiliblib.a: ${ALLO}
        sccs get $<
 
 clean:
        sccs get $<
 
 clean:

-       for i in ${ALLO} errs apiliblib.a makefile.bak \
+       for i in ${ALLO} errs apilib.a makefile.bak \

                disp_out asc_disp.out astosc.out disp_asc.out \
                test* test$O t1* t1$O t2* t2$O; \
                        do (${RM} $$i); done
                disp_out asc_disp.out astosc.out disp_asc.out \
                test* test$O t1* t1$O t2* t2$O; \
                        do (${RM} $$i); done


@@ -78,14 +78,14 @@ sccsclean:
 action:
        ${ACTION}
 
 action:
        ${ACTION}
 

-test:  apiliblib.a test$O
-       ${CC} ${CFLAGS} -o $@ test$O apiliblib.a
+test:  apilib.a test$O
+       ${CC} ${CFLAGS} -o $@ test$O apilib.a

 
 

-t1:    apiliblib.a t1$O
-       ${CC} ${CFLAGS} -o $@ t1$O apiliblib.a
+t1:    apilib.a t1$O
+       ${CC} ${CFLAGS} -o $@ t1$O apilib.a

 
 

-t2:    apiliblib.a t2$O
-       ${CC} ${CFLAGS} -o $@ t2$O apiliblib.a
+t2:    apilib.a t2$O
+       ${CC} ${CFLAGS} -o $@ t2$O apilib.a

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


@@ -129,9 +129,9 @@ depend:
 
 # DO NOT DELETE THIS LINE
 
 
 # DO NOT DELETE THIS LINE
 

-apilib$O: ../api/api.h apilib.h
-api_bsd$O: ../api/api.h api_exch.h
-api_exch$O: api_exch.h
+apilib$O: ../ctlr/api.h apilib.h
+api_bsd$O: ../ctlr/api.h api_exch.h
+api_exch$O: ../general/general.h api_exch.h

 asc_ebc$O: asc_ebc.h
 astosc$O: ../general/general.h ../ctlr/function.h astosc.h astosc.out
 dctype$O: dctype.h
 asc_ebc$O: asc_ebc.h
 astosc$O: ../general/general.h ../ctlr/function.h astosc.h astosc.out
 dctype$O: dctype.h

diff --git a/usr/src/usr.bin/tn3270/ascii/makefile b/usr/src/usr.bin/tn3270/ascii/makefile
index e9dfd0f..191db0c 100644 (file)
--- a/usr/src/usr.bin/tn3270/ascii/makefile
+++ b/usr/src/usr.bin/tn3270/ascii/makefile
@@ -123,8 +123,8 @@ depend:
 # DO NOT DELETE THIS LINE
 
 map3270$O: state.h ../general/globals.h map3270.ext default.map
 # DO NOT DELETE THIS LINE
 
 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: ../ctlr/function.h state.h ../api/astosc.h ../general/globals.h

 mset$O: map3270.ext
 termin$O: ../general/general.h ../ctlr/function.h ../ctlr/inbound.ext
 mset$O: map3270.ext
 termin$O: ../general/general.h ../ctlr/function.h ../ctlr/inbound.ext

-termin$O: ../ctlr/outbound.ext ../telnet.ext termin.ext ../apilib/astosc.h
-termin$O: state.h ../general/globals.h
+termin$O: ../ctlr/outbound.ext ../telnet.ext termin.ext ../api/astosc.h state.h
+termin$O: ../general/globals.h

diff --git a/usr/src/usr.bin/tn3270/ascii/mset.c b/usr/src/usr.bin/tn3270/ascii/mset.c
index 44ec16e..cc2096f 100644 (file)
--- a/usr/src/usr.bin/tn3270/ascii/mset.c
+++ b/usr/src/usr.bin/tn3270/ascii/mset.c
@@ -39,7 +39,7 @@ static        char    sccsid[] = "@(#)mset.c  3.1  10/29/86";
 #include "../ctlr/function.h"
 
 #include "state.h"
 #include "../ctlr/function.h"
 
 #include "state.h"

-#include "../apilib/astosc.h"
+#include "../api/astosc.h"

 
 #include "../general/globals.h"
 #include "map3270.ext"
 
 #include "../general/globals.h"
 #include "map3270.ext"

diff --git a/usr/src/usr.bin/tn3270/ascii/termin.c b/usr/src/usr.bin/tn3270/ascii/termin.c
index d863a24..d393735 100644 (file)
--- a/usr/src/usr.bin/tn3270/ascii/termin.c
+++ b/usr/src/usr.bin/tn3270/ascii/termin.c
@@ -37,7 +37,7 @@ static        char    sccsid[] = "@(#)termin.c        3.1  10/29/86";
 #include "../telnet.ext"
 #include "termin.ext"
 
 #include "../telnet.ext"
 #include "termin.ext"
 

-#include "../apilib/astosc.h"
+#include "../api/astosc.h"

 #include "state.h"
 
 #include "../general/globals.h"
 #include "state.h"
 
 #include "../general/globals.h"