cvsuser 04/11/12 18:15:15
Modified: config/gen/makefiles root.in
Log:
It looks like the the 'all' target wasn't properly changed, when
applying the patch.
Applying the updated patch from ticket 31643 should fix this.
Courtesy Bernhard Schmalhofer
Revision Changes Path
1.260 +30 -9 parrot/config/gen/makefiles/root.in
Index: root.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/root.in,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- root.in 11 Nov 2004 15:10:17 -0000 1.259
+++ root.in 13 Nov 2004 02:15:15 -0000 1.260
@@ -1,4 +1,4 @@
-# $Id: root.in,v 1.259 2004/11/11 15:10:17 nicholas Exp $
+# $Id: root.in,v 1.260 2004/11/13 02:15:15 coke Exp $
###############################################################################
#
@@ -407,7 +407,14 @@
# note: +distinctinternalnames with +externalnamelen at 8 characters
# (the ANSI standard) is not going to fly for us.
-LINTFLAGS = -weak +showscan +showsummary +posixstrictlib -abstract
+aliasunique +ansireserved +ansireservedinternal +assignexpose +bitwisesigned
+boolcompare +booltype BOOLVAL +casebreak -castfcnptr -charint +continuecomment
+controlnestdepth 15 +cppnames +declundef +distinctinternalnames +evalorder
+fielduse +forcehints -globs +imptype +includenest 8 +incondefs +incondefslib
+linelen 9999 +longintegral +macroassign +macroempty +macroredef
+matchanyintegral +nestedextern +noeffect +readonlystrings +realcompare +shadow
-type
+LINTFLAGS = -weak +showscan +showsummary +posixstrictlib -abstract \
+ +aliasunique +ansireserved +ansireservedinternal +assignexpose \
+ +bitwisesigned +boolcompare +booltype BOOLVAL +casebreak -castfcnptr \
+ -charint +continuecomment +controlnestdepth 15 +cppnames +declundef \
+ +distinctinternalnames +evalorder +fielduse +forcehints -globs \
+ +imptype +includenest 8 +incondefs +incondefslib +linelen 9999 \
+ +longintegral +macroassign +macroempty +macroredef +matchanyintegral \
+ +nestedextern +noeffect +readonlystrings +realcompare +shadow -type
# slightly weaker, more realistic variant.
LINTFLAGS2 = $(LINTFLAGS) -ansireserved -retvalother -bitwisesigned
@@ -475,7 +482,7 @@
#
###############################################################################
-all : flags_dummy $(TEST_PROG) runtime/parrot/include/parrotlib.pbc
runtime/parrot/include/config.fpmc docs $(LIBNCI_SO) $(GEN_LIBRARY)
+all : flags_dummy $(TEST_PROG) runtime/parrot/include/parrotlib.pbc
runtime/parrot/include/config.fpmc docs $(LIBNCI_SO) $(GEN_LIBRARY) dynclasses
# constant string support
.c.str :
@@ -551,13 +558,16 @@
@echo ""
@echo "Cleaning:"
@echo " clean: Basic cleaning up."
- @echo " icu.clean: ICU clean."
@echo " realclean: Removes also files generated by
'Configure.pl'"
@echo " distclean: Remove everything not in MANIFEST."
@echo " cvsclean: Like 'distclean', but keep CVS files."
@echo " reconfig: 'clean' and redo configuration."
@echo " manitest: Check for new files."
@echo ""
+ @echo "Dynamic PMCs:"
+ @echo " dynclasses: Proxy for default target of
dynclasses/Makefile"
+ @echo " dynclasses-clean: Proxy for target 'clean' of
dynclasses/Makefile"
+ @echo ""
@echo "Language implementations:"
@echo " languages: Proxy for default target of
languages/Makefile"
@echo " languages-test: Proxy for target 'test' of
languages/Makefile"
@@ -591,9 +601,6 @@
@echo Compiling with:
@$(PERL) tools/dev/cc_flags.pl ./CFLAGS echo $(CC) $(CFLAGS) -I$(@D)
${cc_o_out} xx$(O) -c xx.c
-dynclasses_dummy :
- cd dynclasses && $(MAKE_C)
-
runtime/parrot/include/parrotlib.pbc: runtime/parrot/library/parrotlib.imc
$(TEST_PROG)
./parrot -o $@ runtime/parrot/library/parrotlib.imc
@@ -997,6 +1004,21 @@
###############################################################################
#
+# dynamic PMC targets:
+#
+###############################################################################
+
+dynclasses : dynclasses.dummy
+
+dynclasses.dummy :
+ $(MAKE_C) dynclasses
+
+dynclasses-clean :
+ $(MAKE_C) dynclasses clean
+
+
+###############################################################################
+#
# language implementation targets:
#
###############################################################################
@@ -1123,13 +1145,12 @@
#
###############################################################################
-clean : testclean progclean languages-clean docs-clean
+clean : testclean progclean languages-clean docs-clean dynclasses-clean
${TEMP_cg_r}
$(RM_F) *.s *~ $(FLUID_FILES) \
examples/assembly/mops${exe} examples/assembly/mops.c \
examples/assembly/mops$(O) examples/assembly/mops.pbc \
examples/mops/mops$(O) examples/mops/mops${exe}
- $(MAKE_C) dynclasses clean
progclean :
$(RM_F) $(O_FILES) \
