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 07:19:39 UTC
[lucy-commits] svn commit: r1140969 - in /incubator/lucy/trunk: charmonizer/Makefile
charmonizer/Makefile.win devel/bin/gen_charmonizer_makefiles.pl
Author: marvin
Date: Wed Jun 29 05:19:38 2011
New Revision: 1140969
URL: http://svn.apache.org/viewvc?rev=1140969&view=rev
Log:
Introduce $(EXEEXT) Makefile 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=1140969&r1=1140968&r2=1140969&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile (original)
+++ incubator/lucy/trunk/charmonizer/Makefile Wed Jun 29 05:19:38 2011
@@ -17,11 +17,12 @@
CC= cc
DEFS=
-PROGNAME= charmonize
+EXEEXT=
+PROGNAME= charmonize$(EXEEXT)
CFLAGS= -Isrc $(DEFS)
CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) core
-TESTS= TestDirManip TestFuncMacro TestHeaders TestIntegers TestLargeFiles TestUnusedVars TestVariadicMacros
+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
@@ -41,25 +42,25 @@ $(PROGNAME): $(OBJS)
$(OBJS) $(TEST_OBJS): $(HEADERS)
-TestDirManip: src/Charmonizer/Test.o src/Charmonizer/Test/TestDirManip.o
+TestDirManip$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestDirManip.o
$(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestDirManip.o
-TestFuncMacro: src/Charmonizer/Test.o src/Charmonizer/Test/TestFuncMacro.o
+TestFuncMacro$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestFuncMacro.o
$(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestFuncMacro.o
-TestHeaders: src/Charmonizer/Test.o src/Charmonizer/Test/TestHeaders.o
+TestHeaders$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestHeaders.o
$(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestHeaders.o
-TestIntegers: src/Charmonizer/Test.o src/Charmonizer/Test/TestIntegers.o
+TestIntegers$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestIntegers.o
$(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestIntegers.o
-TestLargeFiles: src/Charmonizer/Test.o src/Charmonizer/Test/TestLargeFiles.o
+TestLargeFiles$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestLargeFiles.o
$(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestLargeFiles.o
-TestUnusedVars: src/Charmonizer/Test.o src/Charmonizer/Test/TestUnusedVars.o
+TestUnusedVars$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestUnusedVars.o
$(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestUnusedVars.o
-TestVariadicMacros: src/Charmonizer/Test.o src/Charmonizer/Test/TestVariadicMacros.o
+TestVariadicMacros$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestVariadicMacros.o
$(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestVariadicMacros.o
Modified: incubator/lucy/trunk/charmonizer/Makefile.win
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.win?rev=1140969&r1=1140968&r2=1140969&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.win (original)
+++ incubator/lucy/trunk/charmonizer/Makefile.win Wed Jun 29 05:19:38 2011
@@ -1,68 +1,69 @@
-# GENERATED BY gen_charmonizer_makefiles.pl: do not hand-edit!!!
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-CC= cl
-DEFS=
-PROGNAME= charmonize.exe
-LINKER= link -nologo
-CFLAGS= -Isrc -nologo $(DEFS)
-CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) core *.pdb
-
-TESTS= TestDirManip.exe TestFuncMacro.exe TestHeaders.exe TestIntegers.exe TestLargeFiles.exe TestUnusedVars.exe TestVariadicMacros.exe
-
-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.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
-
-.c.obj:
- $(CC) $(CFLAGS) -c $< -Fo$@
-
-all: $(PROGNAME)
-
-$(PROGNAME): $(OBJS)
- $(LINKER) $(OBJS) /OUT:$(PROGNAME)
-
-$(OBJS) $(TEST_OBJS): $(HEADERS)
-
-tests: $(TESTS)
-
-TestDirManip.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestDirManip.obj
- $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestDirManip.obj /OUT:$@
-
-TestFuncMacro.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestFuncMacro.obj
- $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestFuncMacro.obj /OUT:$@
-
-TestHeaders.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestHeaders.obj
- $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestHeaders.obj /OUT:$@
-
-TestIntegers.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestIntegers.obj
- $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestIntegers.obj /OUT:$@
-
-TestLargeFiles.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestLargeFiles.obj
- $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestLargeFiles.obj /OUT:$@
-
-TestUnusedVars.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestUnusedVars.obj
- $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestUnusedVars.obj /OUT:$@
-
-TestVariadicMacros.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestVariadicMacros.obj
- $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestVariadicMacros.obj /OUT:$@
-
-
-clean:
- CMD /c FOR %i IN ($(CLEANABLE)) DO IF EXIST %i DEL /F %i
+# GENERATED BY gen_charmonizer_makefiles.pl: do not hand-edit!!!
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+CC= cl
+DEFS=
+EXEEXT= .exe
+PROGNAME= charmonize$(EXEEXT)
+LINKER= link -nologo
+CFLAGS= -Isrc -nologo $(DEFS)
+CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) core *.pdb
+
+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
+
+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
+
+.c.obj:
+ $(CC) $(CFLAGS) -c $< -Fo$@
+
+all: $(PROGNAME)
+
+$(PROGNAME): $(OBJS)
+ $(LINKER) $(OBJS) /OUT:$(PROGNAME)
+
+$(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:$@
+
+TestFuncMacro$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestFuncMacro.obj
+ $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestFuncMacro.obj /OUT:$@
+
+TestHeaders$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestHeaders.obj
+ $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestHeaders.obj /OUT:$@
+
+TestIntegers$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestIntegers.obj
+ $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestIntegers.obj /OUT:$@
+
+TestLargeFiles$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestLargeFiles.obj
+ $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestLargeFiles.obj /OUT:$@
+
+TestUnusedVars$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestUnusedVars.obj
+ $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestUnusedVars.obj /OUT:$@
+
+TestVariadicMacros$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestVariadicMacros.obj
+ $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestVariadicMacros.obj /OUT:$@
+
+
+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=1140969&r1=1140968&r2=1140969&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl (original)
+++ incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl Wed Jun 29 05:19:38 2011
@@ -54,6 +54,7 @@ sub win_obj {
sub unix_tests {
my @src = @_;
my @test = map /\b(Test\w+)\.c$/, @src; # \w+ skips the Test.c entry
+ $_ .= '$(EXEEXT)' for @test;
my @obj = unix_obj @src;
my $test_obj;
@obj = grep /\bTest\.o$/ ? ($test_obj = $_) && 0 : 1, @obj;
@@ -68,7 +69,7 @@ EOT
sub win_tests {
my @src = @_;
my @test = map /\b(Test\w+)\.c$/, @src; # \w+ skips the Test.c entry
- $_ .= '.exe' for @test;
+ $_ .= '$(EXEEXT)' for @test;
my @obj = win_obj @src;
my $test_obj;
@obj = grep /\bTest\.obj$/ ? ($test_obj = $_) && 0 : 1, @obj;
@@ -89,7 +90,8 @@ sub gen_makefile {
$license
CC= cc
DEFS=
-PROGNAME= charmonize
+EXEEXT=
+PROGNAME= charmonize\$(EXEEXT)
CFLAGS= -Isrc \$(DEFS)
CLEANABLE= \$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) core
@@ -130,7 +132,8 @@ sub gen_makefile_win {
$license
CC= cl
DEFS=
-PROGNAME= charmonize.exe
+EXEEXT= .exe
+PROGNAME= charmonize\$(EXEEXT)
LINKER= link -nologo
CFLAGS= -Isrc -nologo \$(DEFS)
CLEANABLE= \$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) core *.pdb