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 20:34:55 UTC
[lucy-commits] svn commit: r1141192 - in /incubator/lucy/trunk: charmonizer/Makefile
charmonizer/Makefile.win devel/bin/gen_charmonizer_makefiles.pl
Author: marvin
Date: Wed Jun 29 18:34:54 2011
New Revision: 1141192
URL: http://svn.apache.org/viewvc?rev=1141192&view=rev
Log:
Introduce OBJEXT 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=1141192&r1=1141191&r2=1141192&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile (original)
+++ incubator/lucy/trunk/charmonizer/Makefile Wed Jun 29 18:34:54 2011
@@ -18,15 +18,16 @@
CC= cc
DEFS=
EXEEXT=
+OBJEXT= .o
PROGNAME= charmonize$(EXEEXT)
CFLAGS= -Isrc $(DEFS)
CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) core
TESTS= TestDirManip$(EXEEXT) TestFuncMacro$(EXEEXT) TestHeaders$(EXEEXT) TestIntegers$(EXEEXT) TestLargeFiles$(EXEEXT) TestUnusedVars$(EXEEXT) TestVariadicMacros$(EXEEXT)
-OBJS= charmonize.o src/Charmonizer/Core/Compiler.o src/Charmonizer/Core/ConfWriter.o src/Charmonizer/Core/Dir.o src/Charmonizer/Core/HeaderChecker.o src/Charmonizer/Core/OperatingSystem.o src/Charmonizer/Core/Stat.o src/Charmonizer/Core/Util.o src/Charmonizer/Probe.o src/Charmonizer/Probe/AtomicOps.o src/Charmonizer/Probe/DirManip.o src/Charmonizer/Probe/Floats.o src/Charmonizer/Probe/FuncMacro.o src/Charmonizer/Probe/Headers.o src/Charmonizer/Probe/Integers.o src/Charmonizer/Probe/LargeFiles.o src/Charmonizer/Probe/Memory.o src/Charmonizer/Probe/UnusedVars.o src/Charmonizer/Probe/VariadicMacros.o
+OBJS= charmonize$(OBJEXT) src/Charmonizer/Core/Compiler$(OBJEXT) src/Charmonizer/Core/ConfWriter$(OBJEXT) src/Charmonizer/Core/Dir$(OBJEXT) src/Charmonizer/Core/HeaderChecker$(OBJEXT) src/Charmonizer/Core/OperatingSystem$(OBJEXT) src/Charmonizer/Core/Stat$(OBJEXT) src/Charmonizer/Core/Util$(OBJEXT) src/Charmonizer/Probe$(OBJEXT) src/Charmonizer/Probe/AtomicOps$(OBJEXT) src/Charmonizer/Probe/DirManip$(OBJEXT) src/Charmonizer/Probe/Floats$(OBJEXT) src/Charmonizer/Probe/FuncMacro$(OBJEXT) src/Charmonizer/Probe/Headers$(OBJEXT) src/Charmonizer/Probe/Integers$(OBJEXT) src/Charmonizer/Probe/LargeFiles$(OBJEXT) src/Charmonizer/Probe/Memory$(OBJEXT) src/Charmonizer/Probe/UnusedVars$(OBJEXT) src/Charmonizer/Probe/VariadicMacros$(OBJEXT)
-TEST_OBJS= src/Charmonizer/Test.o src/Charmonizer/Test/TestDirManip.o src/Charmonizer/Test/TestFuncMacro.o src/Charmonizer/Test/TestHeaders.o src/Charmonizer/Test/TestIntegers.o src/Charmonizer/Test/TestLargeFiles.o src/Charmonizer/Test/TestUnusedVars.o src/Charmonizer/Test/TestVariadicMacros.o
+TEST_OBJS= src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestDirManip$(OBJEXT) src/Charmonizer/Test/TestFuncMacro$(OBJEXT) src/Charmonizer/Test/TestHeaders$(OBJEXT) src/Charmonizer/Test/TestIntegers$(OBJEXT) src/Charmonizer/Test/TestLargeFiles$(OBJEXT) src/Charmonizer/Test/TestUnusedVars$(OBJEXT) src/Charmonizer/Test/TestVariadicMacros$(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
@@ -42,26 +43,26 @@ $(PROGNAME): $(OBJS)
$(OBJS) $(TEST_OBJS): $(HEADERS)
-TestDirManip$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestDirManip.o
- $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestDirManip.o
+TestDirManip$(EXEEXT): src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestDirManip$(OBJEXT)
+ $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestDirManip$(OBJEXT)
-TestFuncMacro$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestFuncMacro.o
- $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestFuncMacro.o
+TestFuncMacro$(EXEEXT): src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestFuncMacro$(OBJEXT)
+ $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestFuncMacro$(OBJEXT)
-TestHeaders$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestHeaders.o
- $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestHeaders.o
+TestHeaders$(EXEEXT): src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestHeaders$(OBJEXT)
+ $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestHeaders$(OBJEXT)
-TestIntegers$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestIntegers.o
- $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestIntegers.o
+TestIntegers$(EXEEXT): src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestIntegers$(OBJEXT)
+ $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestIntegers$(OBJEXT)
-TestLargeFiles$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestLargeFiles.o
- $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestLargeFiles.o
+TestLargeFiles$(EXEEXT): src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestLargeFiles$(OBJEXT)
+ $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestLargeFiles$(OBJEXT)
-TestUnusedVars$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestUnusedVars.o
- $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestUnusedVars.o
+TestUnusedVars$(EXEEXT): src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestUnusedVars$(OBJEXT)
+ $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestUnusedVars$(OBJEXT)
-TestVariadicMacros$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestVariadicMacros.o
- $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestVariadicMacros.o
+TestVariadicMacros$(EXEEXT): src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestVariadicMacros$(OBJEXT)
+ $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestVariadicMacros$(OBJEXT)
clean:
Modified: incubator/lucy/trunk/charmonizer/Makefile.win
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.win?rev=1141192&r1=1141191&r2=1141192&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.win (original)
+++ incubator/lucy/trunk/charmonizer/Makefile.win Wed Jun 29 18:34:54 2011
@@ -18,6 +18,7 @@
CC= cl
DEFS=
EXEEXT= .exe
+OBJEXT= .obj
PROGNAME= charmonize$(EXEEXT)
LINKER= link -nologo
CFLAGS= -Isrc -nologo $(DEFS)
@@ -25,9 +26,9 @@ CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OB
TESTS= TestDirManip$(EXEEXT) TestFuncMacro$(EXEEXT) TestHeaders$(EXEEXT) TestIntegers$(EXEEXT) TestLargeFiles$(EXEEXT) TestUnusedVars$(EXEEXT) TestVariadicMacros$(EXEEXT)
-OBJS= charmonize.obj src\Charmonizer\Core\Compiler.obj src\Charmonizer\Core\ConfWriter.obj src\Charmonizer\Core\Dir.obj src\Charmonizer\Core\HeaderChecker.obj src\Charmonizer\Core\OperatingSystem.obj src\Charmonizer\Core\Stat.obj src\Charmonizer\Core\Util.obj src\Charmonizer\Probe.obj src\Charmonizer\Probe\AtomicOps.obj src\Charmonizer\Probe\DirManip.obj src\Charmonizer\Probe\Floats.obj src\Charmonizer\Probe\FuncMacro.obj src\Charmonizer\Probe\Headers.obj src\Charmonizer\Probe\Integers.obj src\Charmonizer\Probe\LargeFiles.obj src\Charmonizer\Probe\Memory.obj src\Charmonizer\Probe\UnusedVars.obj src\Charmonizer\Probe\VariadicMacros.obj
+OBJS= charmonize$(OBJEXT) src\Charmonizer\Core\Compiler$(OBJEXT) src\Charmonizer\Core\ConfWriter$(OBJEXT) src\Charmonizer\Core\Dir$(OBJEXT) src\Charmonizer\Core\HeaderChecker$(OBJEXT) src\Charmonizer\Core\OperatingSystem$(OBJEXT) src\Charmonizer\Core\Stat$(OBJEXT) src\Charmonizer\Core\Util$(OBJEXT) src\Charmonizer\Probe$(OBJEXT) src\Charmonizer\Probe\AtomicOps$(OBJEXT) src\Charmonizer\Probe\DirManip$(OBJEXT) src\Charmonizer\Probe\Floats$(OBJEXT) src\Charmonizer\Probe\FuncMacro$(OBJEXT) src\Charmonizer\Probe\Headers$(OBJEXT) src\Charmonizer\Probe\Integers$(OBJEXT) src\Charmonizer\Probe\LargeFiles$(OBJEXT) src\Charmonizer\Probe\Memory$(OBJEXT) src\Charmonizer\Probe\UnusedVars$(OBJEXT) src\Charmonizer\Probe\VariadicMacros$(OBJEXT)
-TEST_OBJS= src\Charmonizer\Test.obj src\Charmonizer\Test\TestDirManip.obj src\Charmonizer\Test\TestFuncMacro.obj src\Charmonizer\Test\TestHeaders.obj src\Charmonizer\Test\TestIntegers.obj src\Charmonizer\Test\TestLargeFiles.obj src\Charmonizer\Test\TestUnusedVars.obj src\Charmonizer\Test\TestVariadicMacros.obj
+TEST_OBJS= src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestDirManip$(OBJEXT) src\Charmonizer\Test\TestFuncMacro$(OBJEXT) src\Charmonizer\Test\TestHeaders$(OBJEXT) src\Charmonizer\Test\TestIntegers$(OBJEXT) src\Charmonizer\Test\TestLargeFiles$(OBJEXT) src\Charmonizer\Test\TestUnusedVars$(OBJEXT) src\Charmonizer\Test\TestVariadicMacros$(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
@@ -43,26 +44,26 @@ $(OBJS) $(TEST_OBJS): $(HEADERS)
tests: $(TESTS)
-TestDirManip$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestDirManip.obj
- $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestDirManip.obj /OUT:$@
+TestDirManip$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestDirManip$(OBJEXT)
+ $(LINKER) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestDirManip$(OBJEXT) /OUT:$@
-TestFuncMacro$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestFuncMacro.obj
- $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestFuncMacro.obj /OUT:$@
+TestFuncMacro$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestFuncMacro$(OBJEXT)
+ $(LINKER) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestFuncMacro$(OBJEXT) /OUT:$@
-TestHeaders$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestHeaders.obj
- $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestHeaders.obj /OUT:$@
+TestHeaders$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestHeaders$(OBJEXT)
+ $(LINKER) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestHeaders$(OBJEXT) /OUT:$@
-TestIntegers$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestIntegers.obj
- $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestIntegers.obj /OUT:$@
+TestIntegers$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestIntegers$(OBJEXT)
+ $(LINKER) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestIntegers$(OBJEXT) /OUT:$@
-TestLargeFiles$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestLargeFiles.obj
- $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestLargeFiles.obj /OUT:$@
+TestLargeFiles$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestLargeFiles$(OBJEXT)
+ $(LINKER) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestLargeFiles$(OBJEXT) /OUT:$@
-TestUnusedVars$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestUnusedVars.obj
- $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestUnusedVars.obj /OUT:$@
+TestUnusedVars$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestUnusedVars$(OBJEXT)
+ $(LINKER) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestUnusedVars$(OBJEXT) /OUT:$@
-TestVariadicMacros$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestVariadicMacros.obj
- $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestVariadicMacros.obj /OUT:$@
+TestVariadicMacros$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestVariadicMacros$(OBJEXT)
+ $(LINKER) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestVariadicMacros$(OBJEXT) /OUT:$@
clean:
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=1141192&r1=1141191&r2=1141192&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl (original)
+++ incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl Wed Jun 29 18:34:54 2011
@@ -41,13 +41,13 @@ sub wanted {
sub unix_obj {
my @o = @_;
- s/\.c$/.o/, tr{\\}{/} for @o;
+ s/\.c$/\$(OBJEXT)/, tr{\\}{/} for @o;
return @o;
}
sub win_obj {
my @obj = @_;
- s/\.c$/.obj/, tr{/}{\\} for @obj;
+ s/\.c$/\$(OBJEXT)/, tr{/}{\\} for @obj;
return @obj;
}
@@ -57,7 +57,7 @@ sub unix_tests {
$_ .= '$(EXEEXT)' for @test;
my @obj = unix_obj @src;
my $test_obj;
- @obj = grep /\bTest\.o$/ ? ($test_obj = $_) && 0 : 1, @obj;
+ @obj = grep /\bTest\$\(OBJEXT\)$/ ? ($test_obj = $_) && 0 : 1, @obj;
my @block;
push @block, <<EOT for 0..$#test;
$test[$_]: $test_obj $obj[$_]
@@ -72,7 +72,7 @@ sub win_tests {
$_ .= '$(EXEEXT)' for @test;
my @obj = win_obj @src;
my $test_obj;
- @obj = grep /\bTest\.obj$/ ? ($test_obj = $_) && 0 : 1, @obj;
+ @obj = grep /\bTest\$\(OBJEXT\)$/ ? ($test_obj = $_) && 0 : 1, @obj;
my @block;
push @block, <<EOT for 0..$#test;
$test[$_]: $test_obj $obj[$_]
@@ -91,6 +91,7 @@ $license
CC= cc
DEFS=
EXEEXT=
+OBJEXT= .o
PROGNAME= charmonize\$(EXEEXT)
CFLAGS= -Isrc \$(DEFS)
CLEANABLE= \$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) core
@@ -133,6 +134,7 @@ $license
CC= cl
DEFS=
EXEEXT= .exe
+OBJEXT= .obj
PROGNAME= charmonize\$(EXEEXT)
LINKER= link -nologo
CFLAGS= -Isrc -nologo \$(DEFS)