You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/06/30 23:04:56 UTC
[lucy-commits] svn commit: r1141716 - in /incubator/lucy/trunk: charmonizer/base.POSIX.mk
charmonizer/base.win.mk devel/bin/gen_charmonizer_makefiles.pl
Author: marvin
Date: Thu Jun 30 21:04:55 2011
New Revision: 1141716
URL: http://svn.apache.org/viewvc?rev=1141716&view=rev
Log:
Trivial reordering and whitespace changes.
Modified:
incubator/lucy/trunk/charmonizer/base.POSIX.mk
incubator/lucy/trunk/charmonizer/base.win.mk
incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl
Modified: incubator/lucy/trunk/charmonizer/base.POSIX.mk
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/base.POSIX.mk?rev=1141716&r1=1141715&r2=1141716&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/base.POSIX.mk (original)
+++ incubator/lucy/trunk/charmonizer/base.POSIX.mk Thu Jun 30 21:04:55 2011
@@ -16,7 +16,6 @@
# limitations under the License.
PROGNAME= charmonize$(EXEEXT)
-CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) *.pdb
TESTS= TestDirManip$(EXEEXT) TestFuncMacro$(EXEEXT) TestHeaders$(EXEEXT) TestIntegers$(EXEEXT) TestLargeFiles$(EXEEXT) TestUnusedVars$(EXEEXT) TestVariadicMacros$(EXEEXT)
@@ -56,6 +55,8 @@ TestUnusedVars$(EXEEXT): src/Charmonizer
TestVariadicMacros$(EXEEXT): src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestVariadicMacros$(OBJEXT)
$(LINKER) $(LINKFLAGS) src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestVariadicMacros$(OBJEXT) $(LINKOUT)"$@"
+CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) *.pdb
clean:
rm -f $(CLEANABLE)
+
Modified: incubator/lucy/trunk/charmonizer/base.win.mk
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/base.win.mk?rev=1141716&r1=1141715&r2=1141716&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/base.win.mk (original)
+++ incubator/lucy/trunk/charmonizer/base.win.mk Thu Jun 30 21:04:55 2011
@@ -16,7 +16,6 @@
# limitations under the License.
PROGNAME= charmonize$(EXEEXT)
-CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) *.pdb
TESTS= TestDirManip$(EXEEXT) TestFuncMacro$(EXEEXT) TestHeaders$(EXEEXT) TestIntegers$(EXEEXT) TestLargeFiles$(EXEEXT) TestUnusedVars$(EXEEXT) TestVariadicMacros$(EXEEXT)
@@ -56,6 +55,8 @@ TestUnusedVars$(EXEEXT): src\Charmonizer
TestVariadicMacros$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestVariadicMacros$(OBJEXT)
$(LINKER) $(LINKFLAGS) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestVariadicMacros$(OBJEXT) $(LINKOUT)"$@"
+CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) *.pdb
clean:
CMD /c FOR %i IN ($(CLEANABLE)) DO IF EXIST %i DEL /F %i
+
Modified: incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl?rev=1141716&r1=1141715&r2=1141716&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl (original)
+++ incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl Thu Jun 30 21:04:55 2011
@@ -86,11 +86,11 @@ sub gen_makefile {
my ( $file, $clean );
if ( $target eq 'win' ) {
$file = 'base.win.mk';
- $clean = "CMD /c FOR %i IN (\$(CLEANABLE)) DO IF EXIST %i DEL /F %i";
+ $clean = "CMD /c FOR %i IN (\$(CLEANABLE)) DO IF EXIST %i DEL /F %i\n";
}
else {
$file = 'base.POSIX.mk';
- $clean = "rm -f \$(CLEANABLE)";
+ $clean = "rm -f \$(CLEANABLE)\n";
}
open my $fh, ">$file" or die "open '$file' failed: $!\n";
my $content = <<EOT;
@@ -98,7 +98,6 @@ sub gen_makefile {
#
$license
PROGNAME= charmonize\$(EXEEXT)
-CLEANABLE= \$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) *.pdb
TESTS= $args{test_execs}
@@ -118,6 +117,7 @@ all: \$(PROGNAME)
tests: \$(TESTS)
$args{test_blocks}
+CLEANABLE= \$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) *.pdb
clean:
$clean