[eros-cvs] cvs commit: eros/src/base/tests/perf/nullkey Makefile test.imgmap.i486

[shap@eros.cs.jhu.edu]

shap        01/11/28 15:28:53

  Modified:    src/base/tests/func/constructor_test Makefile imgmap
               src/base/tests/func/i486/pcconsole Makefile imgmap
               src/base/tests/perf/nullkey Makefile test.imgmap.i486
  Log:
  Some updates for new build dir logic

Revision  Changes    Path
1.30      +8 -9      eros/src/base/tests/func/constructor_test/Makefile

Index: Makefile
===================================================================
RCS file: /cvs/eros/src/base/tests/func/constructor_test/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile	2001/10/01 03:57:34	1.29
+++ Makefile	2001/11/28 20:28:53	1.30
@@ -26,12 +26,11 @@
 EROS_SRC=../../../..
 include $(EROS_SRC)/build/lib/make/makevars.mk
 
-GENERATED=constituents.h
-TARGETS=constructor_test
+GENERATED=$(BUILDDIR)/constituents.h
+TARGETS=$(BUILDDIR)/constructor_test
 OPTIM=-O
-OBJECTS=constructor_test.o
-CLEANLIST=test.sysimg test.sysvol
-INC=-I$(EROS_ROOT)/include
+OBJECTS=$(BUILDDIR)/constructor_test.o
+INC=-I$(BUILDDIR) -I$(EROS_ROOT)/include
 
 BOOT=$(EROS_ROOT)/lib/$(EROS_TARGET)/image/boot
 VOLMAP=../test.volmap
@@ -39,9 +38,9 @@
 include $(EROS_SRC)/build/lib/make/makerules.mk
 include ../test.mk
 
-constructor_test: constructor_test.o $(DOMLIB)
-	$(DOMLINK) $(DOMLINKOPT) -o constructor_test $(DOMCRT0) constructor_test.o -lsmall $(DOMLIB)
+$(BUILDDIR)/constructor_test: $(OBJECTS) $(DOMLIB)
+	$(DOMLINK) $(DOMLINKOPT) -o $@ $(DOMCRT0) $(OBJECTS) -lsmall $(DOMLIB)
 
-constructor_test.c: constituents.h
+constructor_test.c: $(BUILDDIR)/constituents.h
 
--include .*.m
+-include $(BUILDDIR)/.*.m



1.6       +2 -2      eros/src/base/tests/func/constructor_test/imgmap

Index: imgmap
===================================================================
RCS file: /cvs/eros/src/base/tests/func/constructor_test/imgmap,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- imgmap	2001/10/07 12:01:15	1.5
+++ imgmap	2001/11/28 20:28:53	1.6
@@ -40,8 +40,8 @@
 contest = new process with constituents;
 
 /* add a page for the stack: */
-contest pc = symbol "constructor_test" _start;
-contest space = small program "constructor_test";
+contest pc = symbol BUILDDIR "constructor_test" _start;
+contest space = small program BUILDDIR "constructor_test";
 contest schedule = sched(8);	/* normal */
 
 CONSTIT(contest, KC_METACON, 0) = metacon;



1.3       +1 -1      eros/src/base/tests/func/i486/pcconsole/Makefile

Index: Makefile
===================================================================
RCS file: /cvs/eros/src/base/tests/func/i486/pcconsole/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	2001/11/28 20:21:27	1.2
+++ Makefile	2001/11/28 20:28:53	1.3
@@ -44,4 +44,4 @@
 $(BUILDDIR)/pcconsole: $(OBJECTS) $(DOMLIB) $(DOMCRT0)
 	$(DOMLINK) $(DOMLINKOPT) -o $@ $(DOMCRT0) $(OBJECTS) -lsmall $(DOMLIB)
 
--include .*.m
+-include $(BUILDDIR)/.*.m



1.3       +1 -1      eros/src/base/tests/func/i486/pcconsole/imgmap

Index: imgmap
===================================================================
RCS file: /cvs/eros/src/base/tests/func/i486/pcconsole/imgmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- imgmap	2001/11/28 20:22:15	1.2
+++ imgmap	2001/11/28 20:28:53	1.3
@@ -27,7 +27,7 @@
 #include <primebank.map>
 #include <ipltool.map>
 
-pcconsole = new process;
+pcconsole = new process with constituents;
 
 pcconsole space = small program BUILDDIR "pcconsole";
 pcconsole pc = symbol BUILDDIR "pcconsole" _start;



1.18      +6 -7      eros/src/base/tests/perf/nullkey/Makefile

Index: Makefile
===================================================================
RCS file: /cvs/eros/src/base/tests/perf/nullkey/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile	2001/09/27 02:05:13	1.17
+++ Makefile	2001/11/28 20:28:53	1.18
@@ -26,11 +26,10 @@
 EROS_SRC=../../../..
 include $(EROS_SRC)/build/lib/make/makevars.mk
 
-TARGETS=nullkey
+TARGETS=$(BUILDDIR)/nullkey
 OPTIM=-O
-OBJECTS=nullkey.o
-CLEANLIST=test.sysimg test.sysvol
-INC=-I$(EROS_ROOT)/include
+OBJECTS=$(BUILDDIR)/nullkey.o
+INC=-I$(BUILDDIR) -I$(EROS_ROOT)/include
 MAPINC=-I$(EROS_ROOT)/domain
 VOLMAP=../bench.volmap
 
@@ -40,7 +39,7 @@
 
 include ../bench.mk
 
-nullkey: nullkey.o $(DOMLIB) $(DOMCRT0)
-	$(DOMLINK) $(DOMLINKOPT) -o nullkey $(DOMCRT0) nullkey.o -lkeycache $(DOMLIB)
+$(BUILDDIR)/nullkey: $(OBJECTS) $(DOMLIB) $(DOMCRT0)
+	$(DOMLINK) $(DOMLINKOPT) -o $@ $(DOMCRT0) $(OBJECTS) -lkeycache $(DOMLIB)
 
--include .*.m
+-include $(BUILDDIR)/.*.m



1.13      +2 -2      eros/src/base/tests/perf/nullkey/test.imgmap.i486

Index: test.imgmap.i486
===================================================================
RCS file: /cvs/eros/src/base/tests/perf/nullkey/test.imgmap.i486,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- test.imgmap.i486	2001/09/27 02:05:13	1.12
+++ test.imgmap.i486	2001/11/28 20:28:53	1.13
@@ -28,8 +28,8 @@
  * key.
  */
 nullkey = new process;
-nullkey.seg = program segment "nullkey";
-nullkey.pc = symbol "nullkey" _start;
+nullkey.seg = program segment BUILDDIR "nullkey";
+nullkey.pc = symbol BUILDDIR "nullkey" _start;
 nullkey.seg = nullkey.seg with page at 0x20000; /* for stack */
 
 nullkey pc = nullkey.pc;