cvsuser 02/06/30 05:31:47
Modified: config/gen/makefiles root.in
Log:
Make sure we actually call make in the classes directory otherwise a
class won't get rebuilt when it is changed.
Revision Changes Path
1.13 +13 -9 parrot/config/gen/makefiles/root.in
Index: root.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/root.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- root.in 21 Jun 2002 02:03:39 -0000 1.12
+++ root.in 30 Jun 2002 12:31:47 -0000 1.13
@@ -71,6 +71,8 @@
ALL_H_FILES = $(GENERAL_H_FILES)
+O_DIRS = classes
+
CLASS_O_FILES = ${pmc_classes_o}
ENCODING_O_FILES = encodings/singlebyte$(O) encodings/utf8$(O) \
@@ -154,13 +156,13 @@
mops : examples/assembly/mops${exe} examples/mops/mops${exe}
# XXX Unix-only for now
-libparrot$(A) : $(O_FILES)
+libparrot$(A) : $(O_DIRS) $(O_FILES)
$(AR_CRS) $@ $(O_FILES)
-$(TEST_PROG) : test_main$(O) $(GEN_HEADERS) $(O_FILES) lib/Parrot/OpLib/core.pm
lib/Parrot/PMC.pm lib/Parrot/.dummy
+$(TEST_PROG) : test_main$(O) $(GEN_HEADERS) $(O_DIRS) $(O_FILES)
lib/Parrot/OpLib/core.pm lib/Parrot/PMC.pm lib/Parrot/.dummy
$(LD) ${ld_out}$(TEST_PROG) $(LDFLAGS) $(O_FILES) test_main$(O) $(C_LIBS)
-lib_deps_object : $(O_FILES)
+lib_deps_object : $(O_DIRS) $(O_FILES)
$(PERL) tools/dev/lib_deps.pl object $(O_FILES)
lib_deps_source : $(GENERAL_H_FILES)
@@ -187,7 +189,7 @@
shared : blib_lib blib/lib/libparrot$(SO) blib/lib/libcore_prederef$(SO)
$(TEST_PROG_SO)
-blib/lib/libparrot$(SO).${VERSION} : blib_lib $(O_FILES)
+blib/lib/libparrot$(SO).${VERSION} : blib_lib $(O_DIRS) $(O_FILES)
$(LD) $(LD_SHARED) -Wl,-soname,libparrot$(SO).${MAJOR} $(LDFLAGS)
$(LD_OUT)blib/lib/libparrot$(SO).${VERSION} $(O_FILES)
blib/lib/libparrot$(SO).${MAJOR}.${MINOR} : blib/lib/libparrot$(SO).${VERSION}
@@ -227,7 +229,7 @@
pdb$(O) : $(GENERAL_H_FILES)
-$(PDB) : pdb$(O) $(O_FILES)
+$(PDB) : pdb$(O) $(O_DIRS) $(O_FILES)
$(LD) ${ld_out}$(PDB) pdb$(O) $(O_FILES) $(C_LIBS) $(LDFLAGS)
#
@@ -237,7 +239,7 @@
disassemble$(O) : $(GENERAL_H_FILES)
-$(DIS) : disassemble$(O) $(O_FILES)
+$(DIS) : disassemble$(O) $(O_DIRS) $(O_FILES)
$(LD) ${ld_out}$(DIS) disassemble$(O) $(O_FILES) $(C_LIBS) $(LDFLAGS)
#
@@ -275,7 +277,7 @@
examples/assembly/mops.c : examples/assembly/mops.pbc pbc2c.pl
$(PERL) pbc2c.pl examples/assembly/mops.pbc > examples/assembly/mops.c
-examples/assembly/mops${exe} : examples/assembly/mops$(O) $(O_FILES)
+examples/assembly/mops${exe} : examples/assembly/mops$(O) $(O_DIRS) $(O_FILES)
$(LD) $(LDFLAGS) ${ld_out}examples/assembly/mops${exe}
examples/assembly/mops$(O) $(O_FILES) $(C_LIBS)
examples/assembly/life.pbc : examples/assembly/life.pasm assemble.pl
@@ -284,7 +286,7 @@
examples/assembly/life.c : examples/assembly/life.pbc pbc2c.pl
$(PERL) pbc2c.pl examples/assembly/life.pbc > examples/assembly/life.c
-examples/assembly/life${exe} : examples/assembly/life$(O) $(O_FILES)
+examples/assembly/life${exe} : examples/assembly/life$(O) $(O_DIRS) $(O_FILES)
$(LD) $(LDFLAGS) ${ld_out}examples/assembly/life${exe}
examples/assembly/life$(O) $(O_FILES) $(C_LIBS)
###############################################################################
@@ -410,7 +412,9 @@
docs/.dummy :
cd docs && $(MAKE) && cd ..
-$(CLASS_O_FILES) :
+classes : classes/.dummy
+
+classes/.dummy :
cd classes && $(MAKE) && cd ..
languages : languages.dummy
