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/07/03 06:33:02 UTC

[lucy-commits] svn commit: r1142375 - in /incubator/lucy/trunk: charmonizer/Makefile charmonizer/Makefile.MinGW devel/bin/gen_charmonizer_makefiles.pl

Author: marvin
Date: Sun Jul  3 04:33:02 2011
New Revision: 1142375

URL: http://svn.apache.org/viewvc?rev=1142375&view=rev
Log:
Limit cleanup of *.pdb to MSVC.

Modified:
    incubator/lucy/trunk/charmonizer/Makefile
    incubator/lucy/trunk/charmonizer/Makefile.MinGW
    incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl

Modified: incubator/lucy/trunk/charmonizer/Makefile
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile?rev=1142375&r1=1142374&r2=1142375&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile (original)
+++ incubator/lucy/trunk/charmonizer/Makefile Sun Jul  3 04:33:02 2011
@@ -28,7 +28,7 @@ TEST_OBJS= src/Charmonizer/Test.o src/Ch
 
 HEADERS= src/Charmonizer/Core/Compiler.h src/Charmonizer/Core/ConfWriter.h src/Charmonizer/Core/Defines.h src/Charmonizer/Core/Dir.h src/Charmonizer/Core/HeaderChecker.h src/Charmonizer/Core/OperatingSystem.h src/Charmonizer/Core/Stat.h src/Charmonizer/Core/Util.h src/Charmonizer/Probe.h src/Charmonizer/Probe/AtomicOps.h src/Charmonizer/Probe/DirManip.h src/Charmonizer/Probe/Floats.h src/Charmonizer/Probe/FuncMacro.h src/Charmonizer/Probe/Headers.h src/Charmonizer/Probe/Integers.h src/Charmonizer/Probe/LargeFiles.h src/Charmonizer/Probe/Memory.h src/Charmonizer/Probe/UnusedVars.h src/Charmonizer/Probe/VariadicMacros.h src/Charmonizer/Test.h
 
-CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) *.pdb
+CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) 
 
 .c.o:
 	$(CC) $(CFLAGS) -c $*.c -o $@

Modified: incubator/lucy/trunk/charmonizer/Makefile.MinGW
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.MinGW?rev=1142375&r1=1142374&r2=1142375&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.MinGW (original)
+++ incubator/lucy/trunk/charmonizer/Makefile.MinGW Sun Jul  3 04:33:02 2011
@@ -28,7 +28,7 @@ TEST_OBJS= src\Charmonizer\Test.o src\Ch
 
 HEADERS= src\Charmonizer\Core\Compiler.h src\Charmonizer\Core\ConfWriter.h src\Charmonizer\Core\Defines.h src\Charmonizer\Core\Dir.h src\Charmonizer\Core\HeaderChecker.h src\Charmonizer\Core\OperatingSystem.h src\Charmonizer\Core\Stat.h src\Charmonizer\Core\Util.h src\Charmonizer\Probe.h src\Charmonizer\Probe\AtomicOps.h src\Charmonizer\Probe\DirManip.h src\Charmonizer\Probe\Floats.h src\Charmonizer\Probe\FuncMacro.h src\Charmonizer\Probe\Headers.h src\Charmonizer\Probe\Integers.h src\Charmonizer\Probe\LargeFiles.h src\Charmonizer\Probe\Memory.h src\Charmonizer\Probe\UnusedVars.h src\Charmonizer\Probe\VariadicMacros.h src\Charmonizer\Test.h
 
-CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) *.pdb
+CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) 
 
 .c.o:
 	$(CC) $(CFLAGS) -c $*.c -o $@

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=1142375&r1=1142374&r2=1142375&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl (original)
+++ incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl Sun Jul  3 04:33:02 2011
@@ -39,6 +39,7 @@ sub new {
         exe_ext      => $args{exe_ext},
         cc           => $args{cc},
         extra_cflags => $args{extra_cflags} || '',
+        extra_clean  => $args{extra_clean}  || '',
     }, $class;
 
     # Gather source paths, normalized for the target OS.
@@ -184,7 +185,7 @@ TEST_OBJS= $test_objs
 
 HEADERS= $headers
 
-CLEANABLE= \$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) *.pdb
+CLEANABLE= \$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) $self->{extra_clean}
 
 $c2o_rule
 
@@ -233,6 +234,7 @@ sub new { 
         exe_ext      => '.exe',
         cc           => 'cl',
         extra_cflags => '-nologo -D_CRT_SECURE_NO_WARNINGS',
+        extra_clean  => '*.pdb',
         @_ 
     );
 }