What a mess. Got tn3270 to work with/without obj directories, and you

aren't allowed to look at these Makefiles (too embarassing for both
Charles and I) :-(

diff --git a/usr.bin/tn3270/mset/Makefile b/usr.bin/tn3270/mset/Makefile
index 405a856..462a330 100644 (file)
--- a/usr.bin/tn3270/mset/Makefile
+++ b/usr.bin/tn3270/mset/Makefile
@@ -1,4 +1,4 @@
-# $Header: /b/source/CVS/src/usr.bin/tn3270/mset/Makefile,v 1.5 1993/04/29 11:05:59 cgd Exp $
+# $Header: /a/cvs/386BSD/src/usr.bin/tn3270/mset/Makefile,v 1.1 1993/06/29 11:54:42 nate Exp $

 
 .include <../../Makefile.inc>
 
 
 .include <../../Makefile.inc>
 


@@ -18,9 +18,15 @@ PROG = mset
 
 astosc.o: astosc.OUT
 CLEANFILES += astosc.OUT astosc.out
 
 astosc.o: astosc.OUT
 CLEANFILES += astosc.OUT astosc.out

+.if exists(${.CURDIR}/../tools/mkastosc/obj)
+OBJ_DIR=obj
+.else
+OBJ_DIR=.
+.endif
+

 astosc.OUT: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \
 astosc.OUT: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \

-       ${.CURDIR}/../ctlr/${KBD} ${.CURDIR}/../tools/mkastosc/${.CURDIR}/mkastosc
-       ${.CURDIR}/../tools/mkastosc/${.CURDIR}/mkastosc \
+       ${.CURDIR}/../ctlr/${KBD} ${.CURDIR}/../tools/mkastosc/${OBJ_DIR}/mkastosc
+       ${.CURDIR}/../tools/mkastosc/${OBJ_DIR}/mkastosc \

        ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \
                < ${.CURDIR}/../ctlr/${KBD} > ${.TARGET}
        /bin/rm -f astosc.out
        ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \
                < ${.CURDIR}/../ctlr/${KBD} > ${.TARGET}
        /bin/rm -f astosc.out


@@ -28,7 +34,7 @@ astosc.OUT: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \
 
 # astosc.out
 
 
 # astosc.out
 

-${.CURDIR}/../tools/mkastosc/${.CURDIR}/mkastosc:
+${.CURDIR}/../tools/mkastosc/${OBJ_DIR}/mkastosc:

        cd ${.CURDIR}/../tools/mkastosc; make
 
 
        cd ${.CURDIR}/../tools/mkastosc; make
 
 

diff --git a/usr.bin/tn3270/tn3270/Makefile b/usr.bin/tn3270/tn3270/Makefile
index 0bc556b..c8a0e94 100644 (file)
--- a/usr.bin/tn3270/tn3270/Makefile
+++ b/usr.bin/tn3270/tn3270/Makefile
@@ -1,3 +1,29 @@
+# This mess is to make tn3270 work with Berkeley Make
+# We also need to check for obj/no_obj directories
+
+.if exists(${.CURDIR}/../tools/mkastosc/obj)
+SC_OBJ_DIR=obj
+.else
+SC_OBJ_DIR=.
+.endif
+
+.if exists(${.CURDIR}/../tools/mkastods/obj)
+DS_OBJ_DIR=obj
+.else
+DS_OBJ_DIR=.
+.endif
+
+.if exists(${.CURDIR}/../tools/mkdstoas/obj)
+AS_OBJ_DIR=obj
+.else
+AS_OBJ_DIR=.
+.endif
+
+.if exists(${.CURDIR}/../tools/mkhits/obj)
+HITS_OBJ_DIR=obj
+.else
+HITS_OBJ_DIR=.
+.endif

 
 .include <../../Makefile.inc>
 
 
 .include <../../Makefile.inc>
 


@@ -31,9 +57,10 @@ PROG = tn3270
 
 astosc.o: astosc.OUT
 CLEANFILES += astosc.OUT astosc.out
 
 astosc.o: astosc.OUT
 CLEANFILES += astosc.OUT astosc.out

+

 astosc.OUT: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \
 astosc.OUT: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \

-       ${.CURDIR}/../ctlr/${KBD} ${.CURDIR}/../tools/mkastosc/${.CURDIR}/mkastosc
-       ${.CURDIR}/../tools/mkastosc/${.CURDIR}/mkastosc ${.CURDIR}/../ctlr/hostctlr.h \
+       ${.CURDIR}/../ctlr/${KBD} ${.CURDIR}/../tools/mkastosc/${SC_OBJ_DIR}/mkastosc
+       ${.CURDIR}/../tools/mkastosc/${SC_OBJ_DIR}/mkastosc ${.CURDIR}/../ctlr/hostctlr.h \

        ${.CURDIR}/../ctlr/function.h < ${.CURDIR}/../ctlr/${KBD} \
                > ${.TARGET}
        /bin/rm -f astosc.out
        ${.CURDIR}/../ctlr/function.h < ${.CURDIR}/../ctlr/${KBD} \
                > ${.TARGET}
        /bin/rm -f astosc.out


@@ -41,21 +68,22 @@ astosc.OUT: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \
 
 disp_asc.o: asc_disp.OUT disp_asc.OUT
 CLEANFILES += asc_disp.OUT asc_disp.out disp_asc.OUT disp_asc.out
 
 disp_asc.o: asc_disp.OUT disp_asc.OUT
 CLEANFILES += asc_disp.OUT asc_disp.out disp_asc.OUT disp_asc.out

-asc_disp.OUT: ${.CURDIR}/../tools/mkastods/${.CURDIR}/mkastods
-       ${.CURDIR}/../tools/mkastods/${.CURDIR}/mkastods > ${.TARGET}
+asc_disp.OUT: ${.CURDIR}/../tools/mkastods/${DS_OBJ_DIR}/mkastods
+       ${.CURDIR}/../tools/mkastods/${DS_OBJ_DIR}/mkastods > ${.TARGET}

        /bin/rm -f asc_disp.out
        ln -s asc_disp.OUT asc_disp.out
        /bin/rm -f asc_disp.out
        ln -s asc_disp.OUT asc_disp.out

-disp_asc.OUT: ${.CURDIR}/../tools/mkdstoas/${.CURDIR}/mkdstoas
-       ${.CURDIR}/../tools/mkdstoas/${.CURDIR}/mkdstoas > ${.TARGET}
+
+disp_asc.OUT: ${.CURDIR}/../tools/mkdstoas/${AS_OBJ_DIR}/mkdstoas
+       ${.CURDIR}/../tools/mkdstoas/${AS_OBJ_DIR}/mkdstoas > ${.TARGET}

        /bin/rm -f disp_asc.out
        ln -s disp_asc.OUT disp_asc.out
 
 inbound.o: kbd.OUT
 CLEANFILES += kbd.OUT kbd.out
 kbd.OUT: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/${KBD} \
        /bin/rm -f disp_asc.out
        ln -s disp_asc.OUT disp_asc.out
 
 inbound.o: kbd.OUT
 CLEANFILES += kbd.OUT kbd.out
 kbd.OUT: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/${KBD} \

-        ${.CURDIR}/../tools/mkhits/${.CURDIR}/mkhits
+        ${.CURDIR}/../tools/mkhits/${HITS_OBJ_DIR}/mkhits

        ${CC} ${CFLAGS} -E ${.CURDIR}/../ctlr/function.c > TMPfunc.out
        ${CC} ${CFLAGS} -E ${.CURDIR}/../ctlr/function.c > TMPfunc.out

-       ${.CURDIR}/../tools/mkhits/${.CURDIR}/mkhits ${.CURDIR}/../ctlr/hostctlr.h \
+       ${.CURDIR}/../tools/mkhits/${HITS_OBJ_DIR}/mkhits ${.CURDIR}/../ctlr/hostctlr.h \

                TMPfunc.out < ${.CURDIR}/../ctlr/${KBD} > ${.TARGET}
        /bin/rm -f kbd.out
        ln -s kbd.OUT kbd.out
                TMPfunc.out < ${.CURDIR}/../ctlr/${KBD} > ${.TARGET}
        /bin/rm -f kbd.out
        ln -s kbd.OUT kbd.out


@@ -65,13 +93,13 @@ kbd.OUT: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/${KBD} \
 # default.map
 # kbd.out
 
 # default.map
 # kbd.out
 

-${.CURDIR}/../tools/mkastosc/${.CURDIR}/mkastosc:
+${.CURDIR}/../tools/mkastosc/${SC_OBJ_DIR}/mkastosc:

        cd ${.CURDIR}/../tools/mkastosc; make
        cd ${.CURDIR}/../tools/mkastosc; make

-${.CURDIR}/../tools/mkastods/${.CURDIR}/mkastods:
+${.CURDIR}/../tools/mkastods/${DS_OBJ_DIR}/mkastods:

        cd ${.CURDIR}/../tools/mkastods; make
        cd ${.CURDIR}/../tools/mkastods; make

-${.CURDIR}/../tools/mkdstoas/${.CURDIR}/mkdstoas:
+${.CURDIR}/../tools/mkdstoas/${AS_OBJ_DIR}/mkdstoas:

        cd ${.CURDIR}/../tools/mkdstoas; make
        cd ${.CURDIR}/../tools/mkdstoas; make

-${.CURDIR}/../tools/mkhits/${.CURDIR}/mkhits:
+${.CURDIR}/../tools/mkhits/${HITS_OBJ_DIR}/mkhits:

        cd ${.CURDIR}/../tools/mkhits; make
 
 
        cd ${.CURDIR}/../tools/mkhits; make
 
 


@@ -83,3 +111,5 @@ depend: .depend
 
 .PATH: ${.CURDIR}/../api ${.CURDIR}/../ascii ${.CURDIR}/../ctlr
 .PATH: ${.CURDIR}/../general ${.CURDIR}/../sys_curses ${.CURDIR}/../../telnet
 
 .PATH: ${.CURDIR}/../api ${.CURDIR}/../ascii ${.CURDIR}/../ctlr
 .PATH: ${.CURDIR}/../general ${.CURDIR}/../sys_curses ${.CURDIR}/../../telnet

+
+