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/01 00:21:54 UTC
[lucy-commits] svn commit: r1141740 - in /incubator/lucy/trunk: charmonizer/base.POSIX.mk
charmonizer/base.win.mk devel/bin/gen_charmonizer_makefiles.pl
Author: marvin
Date: Thu Jun 30 22:21:54 2011
New Revision: 1141740
URL: http://svn.apache.org/viewvc?rev=1141740&view=rev
Log:
Separate base makefiles into distinct variable assignment and target
definition sections.
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=1141740&r1=1141739&r2=1141740&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/base.POSIX.mk (original)
+++ incubator/lucy/trunk/charmonizer/base.POSIX.mk Thu Jun 30 22:21:54 2011
@@ -25,6 +25,8 @@ TEST_OBJS= src/Charmonizer/Test$(OBJEXT)
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
+
all: $(PROGNAME)
$(PROGNAME): $(OBJS)
@@ -55,8 +57,6 @@ 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=1141740&r1=1141739&r2=1141740&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/base.win.mk (original)
+++ incubator/lucy/trunk/charmonizer/base.win.mk Thu Jun 30 22:21:54 2011
@@ -25,6 +25,8 @@ TEST_OBJS= src\Charmonizer\Test$(OBJEXT)
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
+
all: $(PROGNAME)
$(PROGNAME): $(OBJS)
@@ -55,8 +57,6 @@ 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=1141740&r1=1141739&r2=1141740&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl (original)
+++ incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl Thu Jun 30 22:21:54 2011
@@ -107,6 +107,8 @@ TEST_OBJS= $args{test_objs}
HEADERS= $args{headers}
+CLEANABLE= \$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) *.pdb
+
all: \$(PROGNAME)
\$(PROGNAME): \$(OBJS)
@@ -117,8 +119,6 @@ all: \$(PROGNAME)
tests: \$(TESTS)
$args{test_blocks}
-CLEANABLE= \$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) *.pdb
-
clean:
$clean
EOT