[eros-cvs] cvs commit: eros/src/base/sysimage Makefile
shap@eros.cs.jhu.edu
shap@eros.cs.jhu.edu
Wed, 28 Nov 2001 15:21:27 -0500
shap 01/11/28 15:21:27
Modified: src/base/tests/func/directory_test Makefile
src/base/tests/func/i486/pcconsole Makefile
src/base/tests/func test.mk
src/base/tests/perf bench.mk
src/base/sysimage Makefile
Log:
Patch to build in subdirs
Revision Changes Path
1.26 +7 -8 eros/src/base/tests/func/directory_test/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/eros/src/base/tests/func/directory_test/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile 2001/10/24 21:18:43 1.25
+++ Makefile 2001/11/28 20:21:27 1.26
@@ -26,12 +26,11 @@
EROS_SRC=../../../..
include $(EROS_SRC)/build/lib/make/makevars.mk
-GENERATED=constituents.h
-TARGETS=dirtest
+GENERATED=$(BUILDDIR)/constituents.h
+TARGETS=$(BUILDDIR)/dirtest
OPTIM=-O
-OBJECTS=dirtest.o
-CLEANLIST=test.sysimg test.sysvol
-INC=-I$(EROS_ROOT)/include
+OBJECTS=$(BUILDDIR)/dirtest.o
+INC=-I$(BUILDDIR) -I$(EROS_ROOT)/include
BOOT=$(EROS_ROOT)/lib/$(EROS_TARGET)/image/boot
VOLMAP=../test.volmap
@@ -40,8 +39,8 @@
include ../test.mk
-dirtest.c:constituents.h
+dirtest.c:$(BUILDDIR)/constituents.h
-dirtest: dirtest.o $(DOMLIB) $(DOMCRT0)
- $(DOMLINK) $(DOMLINKOPT) -o dirtest $(DOMCRT0) dirtest.o -lsmall $(DOMLIB)
+$(BUILDDIR)/dirtest: $(OBJECTS) $(DOMLIB) $(DOMCRT0)
+ $(DOMLINK) $(DOMLINKOPT) -o $@ $(DOMCRT0) $(OBJECTS) -lsmall $(DOMLIB)
1.2 +7 -7 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile 2001/07/25 04:51:53 1.1
+++ Makefile 2001/11/28 20:21:27 1.2
@@ -26,11 +26,11 @@
EROS_SRC=../../../../..
include $(EROS_SRC)/build/lib/make/makevars.mk
-GENERATED=constituents.h
-TARGETS=pcconsole
-OBJECTS=pcconsole.o
+GENERATED=$(BUILDDIR)/constituents.h
+TARGETS=$(BUILDDIR)/pcconsole
+OBJECTS=$(BUILDDIR)/pcconsole.o
CLEANLIST=test.sysimg test.sysvol
-INC=-I$(EROS_ROOT)/include
+INC=-I$(BUILDDIR) -I$(EROS_ROOT)/include
BOOT=$(EROS_ROOT)/lib/$(EROS_TARGET)/image/boot
VOLMAP=../../test.volmap
@@ -39,9 +39,9 @@
install all: $(TARGETS)
-pcconsole.c: constituents.h
+pcconsole.c: $(BUILDDIR)/constituents.h
-pcconsole: pcconsole.o $(DOMLIB) $(DOMCRT0)
- $(DOMLINK) $(DOMLINKOPT) -o pcconsole $(DOMCRT0) pcconsole.o -lsmall $(DOMLIB)
+$(BUILDDIR)/pcconsole: $(OBJECTS) $(DOMLIB) $(DOMCRT0)
+ $(DOMLINK) $(DOMLINKOPT) -o $@ $(DOMCRT0) $(OBJECTS) -lsmall $(DOMLIB)
-include .*.m
1.6 +2 -2 eros/src/base/tests/func/test.mk
Index: test.mk
===================================================================
RCS file: /cvs/eros/src/base/tests/func/test.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- test.mk 2001/11/28 19:34:36 1.5
+++ test.mk 2001/11/28 20:21:27 1.6
@@ -90,8 +90,8 @@
# Handles test.sysimg dependencies. This line *must* have all of the
#arguments from the "test.sysimg:" line, above.
-$(BUILDDIR)/.test.sysimg.$(EROS_TARGET).m: $(TARGETS) $(IMGMAP)
- @-$(MKIMAGEDEP) -DBUILDDIR='\"$(BUILDDIR)/\"' -o $(BUILDDIR)/test.sysimg $(MAPINC) $(IMGMAP) $(BUILDDIR)/.test.sysimg.m >/dev/null 2>&1
+$(BUILDDIR)/.test.sysimg.m: $(TARGETS) $(IMGMAP)
+ -$(MKIMAGEDEP) -DBUILDDIR='"$(BUILDDIR)/"' -o $(BUILDDIR)/test.sysimg $(MAPINC) $(IMGMAP) $(BUILDDIR)/.test.sysimg.m >/dev/null 2>&1
-include $(BUILDDIR)/.*.m
1.5 +1 -1 eros/src/base/tests/perf/bench.mk
Index: bench.mk
===================================================================
RCS file: /cvs/eros/src/base/tests/perf/bench.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bench.mk 2001/11/28 19:34:36 1.4
+++ bench.mk 2001/11/28 20:21:27 1.5
@@ -91,7 +91,7 @@
#arguments from the "test.sysimg:" line, above.
$(BUILDDIR)/.test.sysimg.m: $(TARGETS) $(IMGMAP)
- @-$(MKIMAGEDEP) -DBUILDDIR='\"$(BUILDDIR)/\"' -o test.sysimg $(MAPINC) $(IMGMAP) $(BUILDDIR)/.test.sysimg.m >/dev/null 2>&1
+ -$(MKIMAGEDEP) -DBUILDDIR='"$(BUILDDIR)/"' -o $(BUILDDIR)/test.sysimg $(MAPINC) $(IMGMAP) $(BUILDDIR)/.test.sysimg.m >/dev/null 2>&1
# only include the depend file for this target
-include $(BUILDDIR)/.*.m
1.33 +1 -1 eros/src/base/sysimage/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/eros/src/base/sysimage/Makefile,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Makefile 2001/11/28 19:34:36 1.32
+++ Makefile 2001/11/28 20:21:27 1.33
@@ -88,7 +88,7 @@
vmware -x -s floppy0.fileType=file -s floppy0.fileName=`pwd`/$(BUILDDIR)/vmfloppy $(HOME)/vmware/EROS/EROS.cfg
$(BUILDDIR)/.sysimg.m: $(TARGETS) $(IMGMAP)
- @-$(MKIMAGEDEP) -DBUILDDIR='\"$(BUILDDIR)/\"' -o test.sysimg $(MAPINC) $(IMGMAP) .sysimg.m >/dev/null 2>&1
+ @-$(MKIMAGEDEP) -DBUILDDIR='"$(BUILDDIR)/"' -o test.sysimg $(MAPINC) $(IMGMAP) .sysimg.m >/dev/null 2>&1
# only include the depend file for this target
-include $(BUILDDIR)/.*.m