diff --git a/wmake/wmakeDerivedFiles b/wmake/wmakeDerivedFiles index e5f5817e7f..fe6d53e08c 100755 --- a/wmake/wmakeDerivedFiles +++ b/wmake/wmakeDerivedFiles @@ -53,9 +53,6 @@ grep -v "=" files > filesPlusBlank # Add a newline to files to make sure the last line is followed by a newline echo "" >> filesPlusBlank -# Search for java files in filesPlusBlank -nJava=`grep "\.java" filesPlusBlank | wc -l` - # Remove commented lines blank lines, and trailing blanks from files # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -81,17 +78,10 @@ rm tmpSourceFile # make objectFiles # ~~~~~~~~~~~~~~~~ -if [ $nJava -ne 0 ] -then - sed -e 's%^%$(CLASSES_DIR)/%' \ - -e 's%\.[a-zA-Z]*$%\.class%' \ - files.$$ > tmpObjectFiles -else - sed -e 's%.*/%%' \ - -e 's%^%$(OBJECTS_DIR)/%' \ - -e 's%\.[a-zA-Z]*$%\.o%' \ - files.$$ > tmpObjectFiles -fi +sed -e 's%.*/%%' \ + -e 's%^%$(OBJECTS_DIR)/%' \ + -e 's%\.[a-zA-Z]*$%\.o%' \ + files.$$ > tmpObjectFiles echo "OBJECTS = " > tmpObjectFiles2 cat tmpObjectFiles >> tmpObjectFiles2