op public repos

Commit Diff

Commit:: 90026180d1d5fe141ced5b83028a257746a24687
From:: rsc <devnull@localhost>
Date:: Sat Oct 11 03:58:46 2003 UTC
Message:: Use new directory structure.
Actions:: Patch | Tree
commit - 93fb47050c80d20d668035c7d1b89d610c1aa7d8
commit + 90026180d1d5fe141ced5b83028a257746a24687
blob - 687ba69e24ff4104b837fbe530279c2aa6285b86
blob + b7f1f1ac013aec3bc9982da56506a5b64e87b7c9
--- src/Makecommon
+++ src/Makecommon
@@ -1,10 +1,10 @@
 .c.$O:
 	@echo cc $*.c
-	@$(CC) $(CFLAGS) -I$(9SRC)/include $*.c
+	@$(CC) $(CFLAGS) -I$(PLAN9)/include $*.c
 
 %.$O: %.c
 	@echo cc $*.c
-	@$(CC) $(CFLAGS) -I$(9SRC)/include $*.c
+	@$(CC) $(CFLAGS) -I$(PLAN9)/include $*.c
 
 $(OFILES): $(HFILES)
 
blob - 19326a0d6c4680af533c926bed8cc23a4dca6156
blob + 6943b4420d63846c4d9b3f485ffb2b073cd16ad5
--- src/Makefile
+++ src/Makefile
@@ -9,9 +9,9 @@ LIBS=\
 	libutf\
 
 CMDS=\
-	mk\
-	sam\
-	samterm\
+	cmd/mk\
+	cmd/sam\
+	cmd/samterm\
 
 all clean install nuke:
 	for i in $(LIBS) $(CMDS); \
blob - ed2046045319ac8a0916a115030f072fbdaa8c62
blob + e7212d8c7a43716429f39c559d68677e1225f0f9
--- src/Makehdr
+++ src/Makehdr
@@ -13,8 +13,8 @@ X11=/usr/X11R6
 LDFLAGS=
 CFLAGS=
 
-include $(9SRC)/Make.$(SYSNAME)-$(OBJTYPE)
-LDFLAGS+=-L$(9SRC)/lib
+include $(PLAN9)/src/Make.$(SYSNAME)-$(OBJTYPE)
+LDFLAGS+=-L$(PLAN9)/lib
 
 CLEANFILES=*.$O
 NUKEFILES=
blob - 4f8e94889e2206170f34f49388e8b9e569a4b62f
blob + 5974906400440559be757d856c14c102a477cc57
--- src/Makeone
+++ src/Makeone
@@ -4,10 +4,10 @@ $(TARG): $(OFILES)
 	$(CC) -o $(TARG) $(OFILES) $(LDFLAGS)
 
 CLEANFILES+=$(TARG)
-NUKEFILES+=$(9SRC)/bin/$(TARG)
+NUKEFILES+=$(PLAN9)/bin/$(TARG)
 
-include $(9SRC)/Makecommon
+include $(PLAN9)/src/Makecommon
 
 install: $(TARG)
-	cp $(TARG) $(9SRC)/bin
+	cp $(TARG) $(PLAN9)/bin
 
blob - cce08bda63bd3e0d97d3bbddeb20983eb8c938ba
blob + 55adea97b3f8b45f4c407808bbf3ce31eaa8ee1a
--- src/Makesyslib
+++ src/Makesyslib
@@ -1,9 +1,9 @@
-all install: $(9SRC)/lib/$(LIB)
+all install: $(PLAN9)/lib/$(LIB)
 
-$(9SRC)/lib/$(LIB): $(OFILES)
-	$(AR) $(ARFLAGS) $(9SRC)/lib/$(LIB) $(OFILES)
-	$(RANLIB) $(9SRC)/lib/$(LIB)
+$(PLAN9)/lib/$(LIB): $(OFILES)
+	$(AR) $(ARFLAGS) $(PLAN9)/lib/$(LIB) $(OFILES)
+	$(RANLIB) $(PLAN9)/lib/$(LIB)
 
-include $(9SRC)/Makecommon
+include $(PLAN9)/src/Makecommon
 
-NUKEFILES+=$(9SRC)/lib/$(LIB)
+NUKEFILES+=$(PLAN9)/lib/$(LIB)
blob - 4a718460410a8db1c162e6488b7ddaf6089141f7
blob + 8cf31d7474e8e66800306615acde86b596712567
--- src/cmd/mk/Makefile
+++ src/cmd/mk/Makefile
@@ -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
 
blob - bf2917dce6a5450d96039188dc6f649dd9108c36
blob + cb552352daa3a95525470f7dda9376a4e7a6fc65
--- src/cmd/sam/Makefile
+++ src/cmd/sam/Makefile
@@ -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
 
blob - 84926f4a9ef3da2d0e4177d301b99f1f7fde0aac
blob + 3846359e6ee59476dad85f58c09fbedda69eef3d
--- src/cmd/sam/unix.c
+++ src/cmd/sam/unix.c
@@ -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";
blob - 5bf1d97b6ce6ba5a0862c93da8426731d3e65a46
blob + 73256599852088c0da2c60b492bd2ad6751f19e7
--- src/cmd/samterm/Makefile
+++ src/cmd/samterm/Makefile
@@ -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
blob - ab694858f7dc0cc95ef6472ceb58f1eefb1e4192
blob + 885d205c493778f8254899e736d61ed544b29e90
--- src/lib9/Makefile
+++ src/lib9/Makefile
@@ -1,5 +1,5 @@
-9SRC=..
-include $(9SRC)/Makehdr
+PLAN9=../..
+include $(PLAN9)/src/Makehdr
 
 LIB=lib9.a
 
@@ -31,7 +31,7 @@ OFILES=\
 	werrstr.$O\
 
 HFILES=\
-	$(9SRC)/include/lib9.h\
+	$(PLAN9)/include/lib9.h\
 
-include $(9SRC)/Makesyslib
+include $(PLAN9)/src/Makesyslib
 
blob - 62fc84d38baab46077e974cc1b53b27ab3a52914
blob + f404f2566e56268dba43006da61a7b17fb357f1b
--- src/libbio/Makefile
+++ src/libbio/Makefile
@@ -1,5 +1,5 @@
-9SRC=..
-include $(9SRC)/Makehdr
+PLAN9=../..
+include $(PLAN9)/src/Makehdr
 
 LIB=libbio.a
 
@@ -22,10 +22,10 @@ OFILES=\
 	bputrune.$O\
 
 HFILES=\
-	$(9SRC)/include/bio.h\
+	$(PLAN9)/include/bio.h\
 
-include $(9SRC)/Makesyslib
+include $(PLAN9)/src/Makesyslib
 
 bcat: bcat.$O $(LIB)
-	$(CC) -o bcat bcat.$O -L$(9SRC)/lib -lbio -lfmt -lutf
+	$(CC) -o bcat bcat.$O -L$(PLAN9)/lib -lbio -lfmt -lutf
 
blob - 807b8e743aa79f2b6c01b572d420c770b1f5a057
blob + 8e932ee3f6458f57c5c03b515708da8df8d494ee
--- src/libdraw/Makefile
+++ src/libdraw/Makefile
@@ -1,5 +1,5 @@
-9SRC=..
-include $(9SRC)/Makehdr
+PLAN9=../..
+include $(PLAN9)/src/Makehdr
 
 LIB=libdraw.a
 
@@ -104,20 +104,20 @@ OFILES=\
 	unix.$O\
 
 HFILES=\
-	$(9SRC)/include/draw.h\
-	$(9SRC)/include/memdraw.h\
-	$(9SRC)/include/memlayer.h\
-	$(9SRC)/include/event.h\
-	$(9SRC)/include/cursor.h\
-	$(9SRC)/include/mouse.h\
-	$(9SRC)/include/keyboard.h\
+	$(PLAN9)/include/draw.h\
+	$(PLAN9)/include/memdraw.h\
+	$(PLAN9)/include/memlayer.h\
+	$(PLAN9)/include/event.h\
+	$(PLAN9)/include/cursor.h\
+	$(PLAN9)/include/mouse.h\
+	$(PLAN9)/include/keyboard.h\
 	x11-inc.h\
 	x11-memdraw.h\
 
 CFLAGS+=-I$(X11)/include
 
-include $(9SRC)/Makesyslib
+include $(PLAN9)/src/Makesyslib
 
 test: test.o $(LIB)
-	gcc -o test test.o -L$(9SRC) -ldraw -l9 -lfmt -lutf -L$(X11)/lib -lX11 -lm
+	gcc -o test test.o -L$(PLAN9) -ldraw -l9 -lfmt -lutf -L$(X11)/lib -lX11 -lm
 
blob - 1af8450f003f2ed598f108e8f86100f5d632bd62
blob + 9e48a596de4da657590a4d2b0fd079cfdfc351cf
--- src/libfmt/Makefile
+++ src/libfmt/Makefile
@@ -1,5 +1,5 @@
-9SRC=..
-include $(9SRC)/Makehdr
+PLAN9=../..
+include $(PLAN9)/src/Makehdr
 
 LIB=libfmt.a
 
@@ -7,8 +7,10 @@ NUM=\
 	charstod.$O\
 	pow10.$O\
 
+# Could add errfmt, but we want to pick it up from lib9 instead.
 OFILES=\
 	dofmt.$O\
+	errfmt.$O\
 	fltfmt.$O\
 	fmt.$O\
 	fmtfd.$O\
@@ -43,13 +45,13 @@ OFILES=\
 
 HFILES=\
 	fmtdef.h\
-	$(9SRC)/include/fmt.h\
+	$(PLAN9)/include/fmt.h\
 
-include $(9SRC)/Makesyslib
+include $(PLAN9)/src/Makesyslib
 
 $(NAN).$O: nan.h
 strtod.$O: nan.h
 
 test: $(LIB) test.$O
-	$(CC) -o test test.$O $(LIB) -L$(9SRC)/lib -lutf
+	$(CC) -o test test.$O $(LIB) -L$(PLAN9)/lib -lutf
 
blob - 979e4eb15429c1f03bbaaae5bcd5bf5cb3e2ab2e
blob + 3e98103563b794f8e31ded5e847e229bf8145652
--- src/libframe/Makefile
+++ src/libframe/Makefile
@@ -1,5 +1,5 @@
-9SRC=..
-include $(9SRC)/Makehdr
+PLAN9=../..
+include $(PLAN9)/src/Makehdr
 
 LIB=libframe.a
 
@@ -15,8 +15,8 @@ OFILES=\
 	frutil.$O\
 
 HFILES=\
-	$(9SRC)/include/frame.h\
-	$(9SRC)/include/draw.h\
+	$(PLAN9)/include/frame.h\
+	$(PLAN9)/include/draw.h\
 
-include $(9SRC)/Makesyslib
+include $(PLAN9)/src/Makesyslib
 
blob - 7e560b3c65b23765456457b71926ac33350eb528
blob + 7fdd7f950566ff89a88184ac2145df1383e4c3b6
--- src/libregexp/Makefile
+++ src/libregexp/Makefile
@@ -1,5 +1,5 @@
-9SRC=..
-include $(9SRC)/Makehdr
+PLAN9=../..
+include $(PLAN9)/src/Makehdr
 
 LIB=libregexp9.a
 
@@ -14,10 +14,10 @@ OFILES=\
 	rregsub.$O\
 
 HFILES=\
-	$(9SRC)/include/regexp9.h\
+	$(PLAN9)/include/regexp9.h\
 	regcomp.h\
 
-include $(9SRC)/Makesyslib
+include $(PLAN9)/src/Makesyslib
 
 test: test.$O $(LIB)
 	$(CC) -o test test.$O $(LIB) -L/usr/local/lib -lfmt -lutf
blob - 4bd8102bd1c153697ea25e5ddf39c95c35d8ecec
blob + 654c0318ed42ff9a267c990397848274442e23b4
--- src/libthread/Makefile
+++ src/libthread/Makefile
@@ -1,5 +1,5 @@
-9SRC=..
-include $(9SRC)/Makehdr
+PLAN9=../..
+include $(PLAN9)/src/Makehdr
 
 LIB=libthread.a
 
@@ -33,19 +33,19 @@ OFILES=\
 	sched.$O\
 
 HFILES=\
-	$(9SRC)/include/thread.h\
+	$(PLAN9)/include/thread.h\
 	label.h\
 	threadimpl.h\
 
-include $(9SRC)/Makesyslib
+include $(PLAN9)/src/Makesyslib
 
-tprimes: tprimes.$O $(9SRC)/lib/$(LIB)
+tprimes: tprimes.$O $(PLAN9)/lib/$(LIB)
 	$(LD) -o tprimes tprimes.$O $(LDFLAGS) -lthread -l9 -lfmt -lutf
 
-texec: texec.$O $(9SRC)/lib/$(LIB)
+texec: texec.$O $(PLAN9)/lib/$(LIB)
 	$(LD) -o texec texec.$O $(LDFLAGS) -lthread -l9 -lfmt -lutf
 
-trend: trend.$O $(9SRC)/lib/$(LIB)
+trend: trend.$O $(PLAN9)/lib/$(LIB)
 	$(LD) -o trend trend.$O $(LDFLAGS) -lthread -l9 -lfmt -lutf
 
 CLEANFILES+=tprimes texec
blob - 648291a4b42725525bd24f819984a9edbf30b901
blob + 283b73d38256c115eddae63e8cc1f9984a47dd92
--- src/libutf/Makefile
+++ src/libutf/Makefile
@@ -1,5 +1,5 @@
-9SRC=..
-include $(9SRC)/Makehdr
+PLAN9=../..
+include $(PLAN9)/src/Makehdr
 
 LIB=libutf.a
 
@@ -26,6 +26,6 @@ OFILES=\
 	utfutf.$O\
 
 HFILES=\
-	$(9SRC)/include/utf.h\
+	$(PLAN9)/include/utf.h\
 
-include $(9SRC)/Makesyslib
+include $(PLAN9)/src/Makesyslib