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/29 01:11:44 UTC
[lucy-commits] svn commit: r1140895 - in /incubator/lucy/trunk: charmonizer/Makefile
charmonizer/Makefile.win devel/bin/gen_charmonizer_makefiles.pl
Author: marvin
Date: Tue Jun 28 23:11:43 2011
New Revision: 1140895
URL: http://svn.apache.org/viewvc?rev=1140895&view=rev
Log:
LUCY-169 Clean up better after MSVC.
Clean up .pdb files. Also introduce CLEANABLE Make variable.
Modified:
incubator/lucy/trunk/charmonizer/Makefile
incubator/lucy/trunk/charmonizer/Makefile.win
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=1140895&r1=1140894&r2=1140895&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile (original)
+++ incubator/lucy/trunk/charmonizer/Makefile Tue Jun 28 23:11:43 2011
@@ -22,6 +22,7 @@ INCLUDES= -I. -Isrc
DEFINES= $(INCLUDES) $(DEFS)
CFLAGS= -g $(DEFINES)
LIBS=
+CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) core
TESTS= TestDirManip TestFuncMacro TestHeaders TestIntegers TestLargeFiles TestUnusedVars TestVariadicMacros
@@ -66,4 +67,4 @@ TestVariadicMacros: src/Charmonizer/Test
clean:
- rm -f $(OBJS) $(TEST_OBJS) $(PROGNAME) $(TESTS) core
+ rm -f $(CLEANABLE)
Modified: incubator/lucy/trunk/charmonizer/Makefile.win
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.win?rev=1140895&r1=1140894&r2=1140895&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.win (original)
+++ incubator/lucy/trunk/charmonizer/Makefile.win Tue Jun 28 23:11:43 2011
@@ -23,6 +23,7 @@ INCLUDES= -I. -Isrc
DEFINES= $(INCLUDES) $(DEFS) -nologo
CFLAGS= $(DEFINES)
LIBS=
+CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) core *.pdb
TESTS= TestDirManip.exe TestFuncMacro.exe TestHeaders.exe TestIntegers.exe TestLargeFiles.exe TestUnusedVars.exe TestVariadicMacros.exe
@@ -67,4 +68,4 @@ TestVariadicMacros.exe: src\Charmonizer\
clean:
- CMD /c FOR %i IN ($(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) core) DO IF EXIST %i DEL /F %i
+ 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=1140895&r1=1140894&r2=1140895&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl (original)
+++ incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl Tue Jun 28 23:11:43 2011
@@ -94,6 +94,7 @@ INCLUDES= -I. -Isrc
DEFINES= \$(INCLUDES) \$(DEFS)
CFLAGS= -g \$(DEFINES)
LIBS=
+CLEANABLE= \$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) core
TESTS= $args{test_execs}
@@ -118,7 +119,7 @@ tests: \$(TESTS)
$args{test_blocks}
clean:
- rm -f \$(OBJS) \$(TEST_OBJS) \$(PROGNAME) \$(TESTS) core
+ rm -f \$(CLEANABLE)
EOT
print $fh $content;
}
@@ -139,6 +140,7 @@ INCLUDES= -I. -Isrc
DEFINES= \$(INCLUDES) \$(DEFS) -nologo
CFLAGS= \$(DEFINES)
LIBS=
+CLEANABLE= \$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) core *.pdb
TESTS= $args{test_execs}
@@ -163,7 +165,7 @@ tests: \$(TESTS)
$args{test_blocks}
clean:
- CMD /c FOR %i IN (\$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) core) DO IF EXIST %i DEL /F %i
+ CMD /c FOR %i IN (\$(CLEANABLE)) DO IF EXIST %i DEL /F %i
EOT
print $fh $content;
}