Use new directory structure.
This commit is contained in:
parent
93fb47050c
commit
90026180d1
17 changed files with 78 additions and 76 deletions
|
|
@ -1,5 +1,5 @@
|
|||
9SRC=..
|
||||
include $(9SRC)/Makehdr
|
||||
PLAN9=../../..
|
||||
include $(PLAN9)/src/Makehdr
|
||||
|
||||
TARG=mk
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ HFILES=\
|
|||
mk.h\
|
||||
fns.h\
|
||||
|
||||
LDFLAGS+=-lregexp9 -lbio -lfmt -lutf
|
||||
LDFLAGS+=-lregexp9 -lbio -l9 -lfmt -lutf
|
||||
|
||||
include $(9SRC)/Makeone
|
||||
include $(PLAN9)/src/Makeone
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
9SRC=..
|
||||
include $(9SRC)/Makehdr
|
||||
PLAN9=../../..
|
||||
include $(PLAN9)/src/Makehdr
|
||||
|
||||
TARG=sam
|
||||
OFILES=sam.$O\
|
||||
|
|
@ -30,5 +30,5 @@ HFILES=sam.h\
|
|||
|
||||
LDFLAGS+=-l9 -lfmt -lutf
|
||||
|
||||
include $(9SRC)/Makeone
|
||||
include $(PLAN9)/src/Makeone
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ static Rune r3[] = {'\'', '"', '`', 0};
|
|||
Rune *right[]= { r1, r2, r3, 0};
|
||||
|
||||
#ifndef SAMTERMNAME
|
||||
#define SAMTERMNAME "/usr/local/bin/samterm"
|
||||
#define SAMTERMNAME "/usr/local/plan9/bin/samterm"
|
||||
#endif
|
||||
#ifndef TMPDIRNAME
|
||||
#define TMPDIRNAME "/tmp"
|
||||
|
|
@ -39,7 +39,7 @@ Rune *right[]= { r1, r2, r3, 0};
|
|||
#define RXPATHNAME "/usr/local/bin/ssh"
|
||||
#endif
|
||||
#ifndef SAMSAVECMDNAME
|
||||
#define SAMSAVECMDNAME "/bin/rc\n/usr/local/bin/samsave"
|
||||
#define SAMSAVECMDNAME "/bin/sh\n/usr/local/plan9/bin/samsave"
|
||||
#endif
|
||||
|
||||
char RSAM[] = "sam";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
9SRC=..
|
||||
include $(9SRC)/Makehdr
|
||||
PLAN9=../../..
|
||||
include $(PLAN9)/src/Makehdr
|
||||
|
||||
TARG=samterm
|
||||
OFILES=\
|
||||
|
|
@ -18,12 +18,12 @@ HFILES=\
|
|||
flayer.h\
|
||||
../sam/sam.h\
|
||||
../sam/mesg.h\
|
||||
$(9SRC)/include/frame.h\
|
||||
$(9SRC)/include/draw.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: $(9SRC)/lib/libdraw.a
|
||||
samterm: $(PLAN9)/lib/libdraw.a
|
||||
|
||||
include ../Makeone
|
||||
include $(PLAN9)/src/Makeone
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue