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 03:43:50 UTC
[lucy-commits] svn commit: r1142357 - in /incubator/lucy/trunk: charmonizer/Makefile
charmonizer/Makefile.MSVC charmonizer/Makefile.MinGW
devel/bin/gen_charmonizer_makefiles.pl
Author: marvin
Date: Sun Jul 3 01:43:50 2011
New Revision: 1142357
URL: http://svn.apache.org/viewvc?rev=1142357&view=rev
Log:
Go back to using hard-coded object extension instead of $(OBJEXT) Makefile
variable.
Modified:
incubator/lucy/trunk/charmonizer/Makefile
incubator/lucy/trunk/charmonizer/Makefile.MSVC
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=1142357&r1=1142356&r2=1142357&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile (original)
+++ incubator/lucy/trunk/charmonizer/Makefile Sun Jul 3 01:43:50 2011
@@ -18,7 +18,6 @@
CC= cc
DEFS=
CFLAGS= -Isrc $(DEFS)
-OBJEXT= .o
EXEEXT=
LINKER= $(CC)
LINKFLAGS= $(CFLAGS)
@@ -31,9 +30,9 @@ PROGNAME= charmonize$(EXEEXT)
TESTS= TestDirManip$(EXEEXT) TestFuncMacro$(EXEEXT) TestHeaders$(EXEEXT) TestIntegers$(EXEEXT) TestLargeFiles$(EXEEXT) TestUnusedVars$(EXEEXT) TestVariadicMacros$(EXEEXT)
-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)
+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
-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)
+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
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
@@ -48,26 +47,26 @@ $(OBJS) $(TEST_OBJS): $(HEADERS)
tests: $(TESTS)
-TestDirManip$(EXEEXT): src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestDirManip$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestDirManip$(OBJEXT) $(LINKOUT)"$@"
+TestDirManip$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestDirManip.o
+ $(LINKER) $(LINKFLAGS) src/Charmonizer/Test.o src/Charmonizer/Test/TestDirManip.o $(LINKOUT)"$@"
-TestFuncMacro$(EXEEXT): src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestFuncMacro$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestFuncMacro$(OBJEXT) $(LINKOUT)"$@"
+TestFuncMacro$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestFuncMacro.o
+ $(LINKER) $(LINKFLAGS) src/Charmonizer/Test.o src/Charmonizer/Test/TestFuncMacro.o $(LINKOUT)"$@"
-TestHeaders$(EXEEXT): src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestHeaders$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestHeaders$(OBJEXT) $(LINKOUT)"$@"
+TestHeaders$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestHeaders.o
+ $(LINKER) $(LINKFLAGS) src/Charmonizer/Test.o src/Charmonizer/Test/TestHeaders.o $(LINKOUT)"$@"
-TestIntegers$(EXEEXT): src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestIntegers$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestIntegers$(OBJEXT) $(LINKOUT)"$@"
+TestIntegers$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestIntegers.o
+ $(LINKER) $(LINKFLAGS) src/Charmonizer/Test.o src/Charmonizer/Test/TestIntegers.o $(LINKOUT)"$@"
-TestLargeFiles$(EXEEXT): src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestLargeFiles$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestLargeFiles$(OBJEXT) $(LINKOUT)"$@"
+TestLargeFiles$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestLargeFiles.o
+ $(LINKER) $(LINKFLAGS) src/Charmonizer/Test.o src/Charmonizer/Test/TestLargeFiles.o $(LINKOUT)"$@"
-TestUnusedVars$(EXEEXT): src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestUnusedVars$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestUnusedVars$(OBJEXT) $(LINKOUT)"$@"
+TestUnusedVars$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestUnusedVars.o
+ $(LINKER) $(LINKFLAGS) src/Charmonizer/Test.o src/Charmonizer/Test/TestUnusedVars.o $(LINKOUT)"$@"
-TestVariadicMacros$(EXEEXT): src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestVariadicMacros$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src/Charmonizer/Test$(OBJEXT) src/Charmonizer/Test/TestVariadicMacros$(OBJEXT) $(LINKOUT)"$@"
+TestVariadicMacros$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestVariadicMacros.o
+ $(LINKER) $(LINKFLAGS) src/Charmonizer/Test.o src/Charmonizer/Test/TestVariadicMacros.o $(LINKOUT)"$@"
clean:
rm -f $(CLEANABLE)
Modified: incubator/lucy/trunk/charmonizer/Makefile.MSVC
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.MSVC?rev=1142357&r1=1142356&r2=1142357&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.MSVC (original)
+++ incubator/lucy/trunk/charmonizer/Makefile.MSVC Sun Jul 3 01:43:50 2011
@@ -18,7 +18,6 @@
CC= cl
DEFS=
CFLAGS= -Isrc -nologo -D_CRT_SECURE_NO_WARNINGS $(DEFS)
-OBJEXT= .obj
EXEEXT= .exe
LINKER= link
LINKFLAGS= -nologo
@@ -31,9 +30,9 @@ PROGNAME= charmonize$(EXEEXT)
TESTS= TestDirManip$(EXEEXT) TestFuncMacro$(EXEEXT) TestHeaders$(EXEEXT) TestIntegers$(EXEEXT) TestLargeFiles$(EXEEXT) TestUnusedVars$(EXEEXT) TestVariadicMacros$(EXEEXT)
-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)
+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
-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)
+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
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
@@ -48,26 +47,26 @@ $(OBJS) $(TEST_OBJS): $(HEADERS)
tests: $(TESTS)
-TestDirManip$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestDirManip$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestDirManip$(OBJEXT) $(LINKOUT)"$@"
+TestDirManip$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestDirManip.obj
+ $(LINKER) $(LINKFLAGS) src\Charmonizer\Test.obj src\Charmonizer\Test\TestDirManip.obj $(LINKOUT)"$@"
-TestFuncMacro$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestFuncMacro$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestFuncMacro$(OBJEXT) $(LINKOUT)"$@"
+TestFuncMacro$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestFuncMacro.obj
+ $(LINKER) $(LINKFLAGS) src\Charmonizer\Test.obj src\Charmonizer\Test\TestFuncMacro.obj $(LINKOUT)"$@"
-TestHeaders$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestHeaders$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestHeaders$(OBJEXT) $(LINKOUT)"$@"
+TestHeaders$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestHeaders.obj
+ $(LINKER) $(LINKFLAGS) src\Charmonizer\Test.obj src\Charmonizer\Test\TestHeaders.obj $(LINKOUT)"$@"
-TestIntegers$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestIntegers$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestIntegers$(OBJEXT) $(LINKOUT)"$@"
+TestIntegers$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestIntegers.obj
+ $(LINKER) $(LINKFLAGS) src\Charmonizer\Test.obj src\Charmonizer\Test\TestIntegers.obj $(LINKOUT)"$@"
-TestLargeFiles$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestLargeFiles$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestLargeFiles$(OBJEXT) $(LINKOUT)"$@"
+TestLargeFiles$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestLargeFiles.obj
+ $(LINKER) $(LINKFLAGS) src\Charmonizer\Test.obj src\Charmonizer\Test\TestLargeFiles.obj $(LINKOUT)"$@"
-TestUnusedVars$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestUnusedVars$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestUnusedVars$(OBJEXT) $(LINKOUT)"$@"
+TestUnusedVars$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestUnusedVars.obj
+ $(LINKER) $(LINKFLAGS) src\Charmonizer\Test.obj src\Charmonizer\Test\TestUnusedVars.obj $(LINKOUT)"$@"
-TestVariadicMacros$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestVariadicMacros$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestVariadicMacros$(OBJEXT) $(LINKOUT)"$@"
+TestVariadicMacros$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestVariadicMacros.obj
+ $(LINKER) $(LINKFLAGS) src\Charmonizer\Test.obj src\Charmonizer\Test\TestVariadicMacros.obj $(LINKOUT)"$@"
clean:
CMD /c FOR %i IN ($(CLEANABLE)) DO IF EXIST %i DEL /F %i
Modified: incubator/lucy/trunk/charmonizer/Makefile.MinGW
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.MinGW?rev=1142357&r1=1142356&r2=1142357&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.MinGW (original)
+++ incubator/lucy/trunk/charmonizer/Makefile.MinGW Sun Jul 3 01:43:50 2011
@@ -18,7 +18,6 @@
CC= gcc
DEFS=
CFLAGS= -Isrc $(DEFS)
-OBJEXT= .o
EXEEXT= .exe
LINKER= $(CC)
LINKFLAGS= $(CFLAGS)
@@ -31,9 +30,9 @@ PROGNAME= charmonize$(EXEEXT)
TESTS= TestDirManip$(EXEEXT) TestFuncMacro$(EXEEXT) TestHeaders$(EXEEXT) TestIntegers$(EXEEXT) TestLargeFiles$(EXEEXT) TestUnusedVars$(EXEEXT) TestVariadicMacros$(EXEEXT)
-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)
+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
-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)
+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
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
@@ -48,26 +47,26 @@ $(OBJS) $(TEST_OBJS): $(HEADERS)
tests: $(TESTS)
-TestDirManip$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestDirManip$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestDirManip$(OBJEXT) $(LINKOUT)"$@"
+TestDirManip$(EXEEXT): src\Charmonizer\Test.o src\Charmonizer\Test\TestDirManip.o
+ $(LINKER) $(LINKFLAGS) src\Charmonizer\Test.o src\Charmonizer\Test\TestDirManip.o $(LINKOUT)"$@"
-TestFuncMacro$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestFuncMacro$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestFuncMacro$(OBJEXT) $(LINKOUT)"$@"
+TestFuncMacro$(EXEEXT): src\Charmonizer\Test.o src\Charmonizer\Test\TestFuncMacro.o
+ $(LINKER) $(LINKFLAGS) src\Charmonizer\Test.o src\Charmonizer\Test\TestFuncMacro.o $(LINKOUT)"$@"
-TestHeaders$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestHeaders$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestHeaders$(OBJEXT) $(LINKOUT)"$@"
+TestHeaders$(EXEEXT): src\Charmonizer\Test.o src\Charmonizer\Test\TestHeaders.o
+ $(LINKER) $(LINKFLAGS) src\Charmonizer\Test.o src\Charmonizer\Test\TestHeaders.o $(LINKOUT)"$@"
-TestIntegers$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestIntegers$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestIntegers$(OBJEXT) $(LINKOUT)"$@"
+TestIntegers$(EXEEXT): src\Charmonizer\Test.o src\Charmonizer\Test\TestIntegers.o
+ $(LINKER) $(LINKFLAGS) src\Charmonizer\Test.o src\Charmonizer\Test\TestIntegers.o $(LINKOUT)"$@"
-TestLargeFiles$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestLargeFiles$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestLargeFiles$(OBJEXT) $(LINKOUT)"$@"
+TestLargeFiles$(EXEEXT): src\Charmonizer\Test.o src\Charmonizer\Test\TestLargeFiles.o
+ $(LINKER) $(LINKFLAGS) src\Charmonizer\Test.o src\Charmonizer\Test\TestLargeFiles.o $(LINKOUT)"$@"
-TestUnusedVars$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestUnusedVars$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestUnusedVars$(OBJEXT) $(LINKOUT)"$@"
+TestUnusedVars$(EXEEXT): src\Charmonizer\Test.o src\Charmonizer\Test\TestUnusedVars.o
+ $(LINKER) $(LINKFLAGS) src\Charmonizer\Test.o src\Charmonizer\Test\TestUnusedVars.o $(LINKOUT)"$@"
-TestVariadicMacros$(EXEEXT): src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestVariadicMacros$(OBJEXT)
- $(LINKER) $(LINKFLAGS) src\Charmonizer\Test$(OBJEXT) src\Charmonizer\Test\TestVariadicMacros$(OBJEXT) $(LINKOUT)"$@"
+TestVariadicMacros$(EXEEXT): src\Charmonizer\Test.o src\Charmonizer\Test\TestVariadicMacros.o
+ $(LINKER) $(LINKFLAGS) src\Charmonizer\Test.o src\Charmonizer\Test\TestVariadicMacros.o $(LINKOUT)"$@"
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=1142357&r1=1142356&r2=1142357&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl (original)
+++ incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl Sun Jul 3 01:43:50 2011
@@ -28,13 +28,14 @@ sub new {
my ( $class, %args ) = @_;
# Validate args, create object.
- for (qw( dir filename )) {
+ for (qw( dir filename obj_ext )) {
$args{$_} or confess("Missing required param '$_'");
}
my $dir = $args{dir};
my $self = bless {
dir => $dir,
filename => $args{filename},
+ obj_ext => $args{obj_ext},
}, $class;
# Gather source paths, normalized for the target OS.
@@ -81,7 +82,7 @@ sub winnify {
sub objectify {
my ( $self, @objects ) = @_;
for (@objects) {
- s/\.c$/\$(OBJEXT)/ or die "No match: $_";
+ s/\.c$/$self->{obj_ext}/ or die "No match: $_";
}
return @objects;
}
@@ -102,11 +103,10 @@ sub test_blocks {
for my $c_file (@c_files) {
my $exe = $c_file;
$exe =~ s/.*(Test\w+)\.c$/$1\$(EXEEXT)/ or die "no match $exe";
- my $obj = $c_file;
- $obj =~ s/\.c$/\$(OBJEXT)/ or die "no match: $obj";
+ my ($obj) = $self->objectify($c_file);
push @blocks, <<END_BLOCK;
-$exe: src/Charmonizer/Test\$(OBJEXT) $obj
-\t\$(LINKER) \$(LINKFLAGS) src/Charmonizer/Test\$(OBJEXT) $obj \$(LINKOUT)"\$@"
+$exe: src/Charmonizer/Test$self->{obj_ext} $obj
+\t\$(LINKER) \$(LINKFLAGS) src/Charmonizer/Test$self->{obj_ext} $obj \$(LINKOUT)"\$@"
END_BLOCK
}
return @blocks;
@@ -200,14 +200,20 @@ END_LICENSE
package Charmonizer::Build::Makefile::Posix;
BEGIN { our @ISA = qw( Charmonizer::Build::Makefile ) }
-sub new { shift->SUPER::new( filename => 'Makefile', @_ ) }
+sub new {
+ my $class = shift;
+ return $class->SUPER::new(
+ filename => 'Makefile',
+ obj_ext => '.o',
+ @_
+ );
+}
sub top {
return <<END_STUFF;
CC= cc
DEFS=
CFLAGS= -Isrc \$(DEFS)
-OBJEXT= .o
EXEEXT=
LINKER= \$(CC)
LINKFLAGS= \$(CFLAGS)
@@ -224,14 +230,21 @@ sub pathify { shift->unixify(@_) }
package Charmonizer::Build::Makefile::MSVC;
BEGIN { our @ISA = qw( Charmonizer::Build::Makefile ) }
-sub new { shift->SUPER::new( filename => 'Makefile.MSVC', @_ ) }
+sub new {
+ my $class = shift;
+ return $class->SUPER::new(
+ filename => 'Makefile.MSVC',
+ obj_ext => '.obj',
+ @_
+ );
+}
+
sub top {
return <<END_STUFF;
CC= cl
DEFS=
CFLAGS= -Isrc -nologo -D_CRT_SECURE_NO_WARNINGS \$(DEFS)
-OBJEXT= .obj
EXEEXT= .exe
LINKER= link
LINKFLAGS= -nologo
@@ -248,14 +261,20 @@ sub clean_target { shift->clean_target_w
package Charmonizer::Build::Makefile::MinGW;
BEGIN { our @ISA = qw( Charmonizer::Build::Makefile ) }
-sub new { shift->SUPER::new( filename => 'Makefile.MinGW', @_ ) }
+sub new {
+ my $class = shift;
+ return $class->SUPER::new(
+ filename => 'Makefile.MinGW',
+ obj_ext => '.o',
+ @_
+ );
+}
sub top {
return <<END_STUFF;
CC= gcc
DEFS=
CFLAGS= -Isrc \$(DEFS)
-OBJEXT= .o
EXEEXT= .exe
LINKER= \$(CC)
LINKFLAGS= \$(CFLAGS)