diff options
| -rw-r--r-- | src/cmd/mk/mkfile (renamed from src/cmd/mk/Makefile) | 6 | ||||
| -rw-r--r-- | src/cmd/samterm/Makefile | 29 | ||||
| -rw-r--r-- | src/cmd/samterm/mkfile | 30 |
3 files changed, 33 insertions, 32 deletions
diff --git a/src/cmd/mk/Makefile b/src/cmd/mk/mkfile index 8cf31d74..e755629b 100644 --- a/src/cmd/mk/Makefile +++ b/src/cmd/mk/mkfile @@ -1,5 +1,5 @@ PLAN9=../../.. -include $(PLAN9)/src/Makehdr +<$PLAN9/src/mkhdr TARG=mk @@ -31,7 +31,7 @@ HFILES=\ mk.h\ fns.h\ -LDFLAGS+=-lregexp9 -lbio -l9 -lfmt -lutf +LDFLAGS=$LDFLAGS -lregexp9 -lbio -lfmt -lutf -include $(PLAN9)/src/Makeone +<$PLAN9/src/mkone diff --git a/src/cmd/samterm/Makefile b/src/cmd/samterm/Makefile deleted file mode 100644 index 73256599..00000000 --- a/src/cmd/samterm/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -PLAN9=../../.. -include $(PLAN9)/src/Makehdr - -TARG=samterm -OFILES=\ - main.$O\ - icons.$O\ - menu.$O\ - mesg.$O\ - rasp.$O\ - scroll.$O\ - flayer.$O\ - io.$O\ - plan9.$O\ - -HFILES=\ - samterm.h\ - flayer.h\ - ../sam/sam.h\ - ../sam/mesg.h\ - $(PLAN9)/include/frame.h\ - $(PLAN9)/include/draw.h\ - -CFLAGS+=-I../sam -LDFLAGS+=-lframe -ldraw -lthread -l9 -lregexp9 -lbio -lfmt -lutf -L$(X11)/lib -lX11 -lm - -samterm: $(PLAN9)/lib/libdraw.a - -include $(PLAN9)/src/Makeone diff --git a/src/cmd/samterm/mkfile b/src/cmd/samterm/mkfile new file mode 100644 index 00000000..a6b9a60e --- /dev/null +++ b/src/cmd/samterm/mkfile @@ -0,0 +1,30 @@ +PLAN9=../../.. +<$PLAN9/src/mkhdr + +TARG=samterm +OFILES=\ + main.$O\ + icons.$O\ + menu.$O\ + mesg.$O\ + rasp.$O\ + scroll.$O\ + flayer.$O\ + io.$O\ + plan9.$O\ + +HFILES=\ + samterm.h\ + flayer.h\ + ../sam/sam.h\ + ../sam/mesg.h\ + $PLAN9/include/frame.h\ + $PLAN9/include/draw.h\ + +CFLAGS=$CFLAGS -I../sam +LDFLAGS=$LDFLAGS -lframe -ldraw -lthread -l9 -lregexp9 \ + -lbio -lfmt -lutf -L$X11/lib -lX11 -lm + +o.samterm: $PLAN9/lib/libdraw.a + +<$PLAN9/src/mkone |