harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlyd...@apache.org
Subject svn commit: r391516 - /incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/MakeRules
Date Wed, 05 Apr 2006 05:23:09 GMT
Author: dlydick
Date: Tue Apr  4 22:23:07 2006
New Revision: 391516

URL: http://svn.apache.org/viewcvs?rev=391516&view=rev
Log:
Corrected LFLAGS definition.

Explained 'makedepend' mechanism better.

Made 'tags' rule sensitive to presence of 'ctags' utility.

Modified:
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/MakeRules

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/MakeRules
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/MakeRules?rev=391516&r1=391515&r2=391516&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/MakeRules (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/support/MakeRules Tue
Apr  4 22:23:07 2006
@@ -41,7 +41,7 @@
 # @section Reference
 #
 #/ /* 
-# (Use  #! and #/ with dox_filter.sh to fool Doxygen into
+# (Use  #! and #/ with dox-filter.sh to fool Doxygen into
 # parsing this non-source text file for the documentation set.
 # Use the above open comment to force termination of parsing
 # since it is not a Doxygen-style 'C' comment.)
@@ -104,7 +104,7 @@
 
 CFLAGS:=-m$(CONFIG_WORDWIDTH) -O0 -g3 -Wall -fmessage-length=0 -ansi
 
-LFLAGS=-m$W(CONFIG_WORDWIDTH) -lpthread -lm -L$(TOPDIR)/libjvm/lib
+LFLAGS=-m$(CONFIG_WORDWIDTH) -lpthread -lm -L$(TOPDIR)/libjvm/lib
 
 ARCMD=r
 
@@ -164,6 +164,11 @@
 # Do nothing for these rules unless 'C' sources are defined.
 # If defined, additional actions are also defined.
 #
+# If 'makedepend' is in the $PATH, then HAVE_MAKEDEPEND will be 1.
+# If 'ctags' is in the $PATH, then HAVE_CTAGS will be 1.
+# If either of these utilities is missing, then invocation of
+# these rules will produce no actions.
+#
 depend::
 nodepend::
 tags::
@@ -211,24 +216,37 @@
 ########################
 #
 # Unconditionally build dependencies for directories with 'C' sources.
-# Ignore request for other directory types.
+# Ignore request for other directory types. Also ignore request when
+# 'makedepend' is not found in $PATH.
 #
+ifeq (1,$(HAVE_MAKEDEPEND))
 
 depend::
 	$(CC_SILENT)$(TOUCHDEPEND)
 	$(CC_SILENT)-$(MAKEDEPEND)
 
+endif
+
+# Permit removal of dependency file regardless of whether or not
+# 'makedepend' is found in $PATH.  Some versions generate a '.bak;
+# also, so get rid of it, too.
 nodepend::
-	$(CC_SILENT)rm -f $(DEPEND_FILE)
+	$(CC_SILENT)rm -f $(DEPEND_FILE) $(DEPEND_FILE).bak
 
+
+# If a dependency file exists anyway, reference it
 -include $(DEPEND_FILE)
 
+
 ########################
 #
 # Unconditionally build editor tag file $(CTAGS_FILE).
+# Do not build it if 'ctags' is not found in $PATH.
 #
+ifeq (1,$(HAVE_CTAGS))
 tags::
 	$(CC_SILENT)-$(CTAGS) -f $(CTAGS_FILE) $(C_SOURCES) $(C_HEADERS)
+endif
 
 ########################
 #
@@ -236,10 +254,12 @@
 #
 all::
 ifeq (,$(wildcard $(DEPEND_FILE)))
+ifeq (1,$(HAVE_MAKEDEPEND))
 	$(CC_SILENT)@$(TOUCHDEPEND)
 	$(CC_SILENT)@-$(MAKEDEPEND)
 
-endif # DEPEND
+endif # HAVE_MAKEDEPEND
+endif # DEPEND_FILE
 
 ########################
 #



Mime
View raw message