You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by jo...@apache.org on 2011/05/29 06:46:10 UTC
[lucy-commits] svn commit: r1128819 - in /incubator/lucy/trunk/charmonizer: Makefile
Makefile.win
Author: joes
Date: Sun May 29 04:46:10 2011
New Revision: 1128819
URL: http://svn.apache.org/viewvc?rev=1128819&view=rev
Log:
first step in making the charmonizer tests independent executables
Modified:
incubator/lucy/trunk/charmonizer/Makefile
incubator/lucy/trunk/charmonizer/Makefile.win
Modified: incubator/lucy/trunk/charmonizer/Makefile
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile?rev=1128819&r1=1128818&r2=1128819&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile (original)
+++ incubator/lucy/trunk/charmonizer/Makefile Sun May 29 04:46:10 2011
@@ -4,6 +4,7 @@ DEFS=
PROGNAME= charmonize
INCLUDES= -I. -Isrc
LIBS=
+TESTS= TestDirManip TestFuncMacro TestHeaders TestIntegers TestLargeFiles TestUnusedVars TestVariadicMacros
DEFINES= $(INCLUDES) $(DEFS)
@@ -11,19 +12,44 @@ CFLAGS= -g $(DEFINES)
SRCS = charmonize.c src/Charmonizer/Probe.c src/Charmonizer/Core/Compiler.c src/Charmonizer/Core/ConfWriter.c src/Charmonizer/Core/Dir.c src/Charmonizer/Core/HeaderChecker.c src/Charmonizer/Core/OperatingSystem.c src/Charmonizer/Core/Stat.c src/Charmonizer/Core/Util.c src/Charmonizer/Probe/AtomicOps.c src/Charmonizer/Probe/DirManip.c src/Charmonizer/Probe/Floats.c src/Charmonizer/Probe/FuncMacro.c src/Charmonizer/Probe/Headers.c src/Charmonizer/Probe/Integers.c src/Charmonizer/Probe/LargeFiles.c src/Charmonizer/Probe/Memory.c src/Charmonizer/Probe/UnusedVars.c src/Charmonizer/Probe/VariadicMacros.c
-TEST_SRCS = src/Charmonizer/Test.c src/Charmonizer/Test/AllTests.c src/Charmonizer/Test/TestDirManip.c src/Charmonizer/Test/TestFuncMacro.c src/Charmonizer/Test/TestHeaders.c src/Charmonizer/Test/TestIntegers.c src/Charmonizer/Test/TestLargeFiles.c src/Charmonizer/Test/TestUnusedVars.c src/Charmonizer/Test/TestVariadicMacros.c
+TEST_SRCS = src/Charmonizer/Test.c src/Charmonizer/Test/TestDirManip.c src/Charmonizer/Test/TestFuncMacro.c src/Charmonizer/Test/TestHeaders.c src/Charmonizer/Test/TestIntegers.c src/Charmonizer/Test/TestLargeFiles.c src/Charmonizer/Test/TestUnusedVars.c src/Charmonizer/Test/TestVariadicMacros.c
OBJS = charmonize.o src/Charmonizer/Probe.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/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.o src/Charmonizer/Test/AllTests.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.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
.c.o:
$(CC) $(CFLAGS) -c $*.c -o $@
all: $(PROGNAME)
+tests: $(TESTS)
+
$(PROGNAME) : $(OBJS)
$(CC) $(CFLAGS) -o $(PROGNAME) $(OBJS) $(LIBS)
+TestDirManip: src/Charmonizer/Test.o src/Charmonizer/Test/TestDirManip.o
+ $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestDirManip.o $(LIBS)
+
+TestFuncMacro: src/Charmonizer/Test.o src/Charmonizer/Test/TestFuncMacro.o
+ $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestFuncMacro.o $(LIBS)
+
+TestHeaders: src/Charmonizer/Test.o src/Charmonizer/Test/TestHeaders.o
+ $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestHeaders.o $(LIBS)
+
+TestIntegers: src/Charmonizer/Test.o src/Charmonizer/Test/TestIntegers.o
+ $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestIntegers.o $(LIBS)
+
+TestLargeFiles: src/Charmonizer/Test.o src/Charmonizer/Test/TestLargeFiles.o
+ $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestLargeFiles.o $(LIBS)
+
+TestUnusedVars: src/Charmonizer/Test.o src/Charmonizer/Test/TestUnusedVars.o
+ $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestUnusedVars.o $(LIBS)
+
+TestVariadicMacros: src/Charmonizer/Test.o src/Charmonizer/Test/TestVariadicMacros.o
+ $(CC) $(CFLAGS) -o $@ src/Charmonizer/Test.o src/Charmonizer/Test/TestVariadicMacros.o $(LIBS)
+
+
clean:
- $(rm) $(OBJS) $(PROGNAME) core *~
+ $(rm) $(OBJS) $(TEST_OBJS) $(PROGNAME) $(TESTS) core *~
+
Modified: incubator/lucy/trunk/charmonizer/Makefile.win
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.win?rev=1128819&r1=1128818&r2=1128819&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.win (original)
+++ incubator/lucy/trunk/charmonizer/Makefile.win Sun May 29 04:46:10 2011
@@ -14,6 +14,7 @@ WINSOCK_LIB=wsock32.lib
LIBS=$(WINSOCK_LIB) $(GUIFLAGS)
RC=rc
RCVARS=-r -DWIN32
+TESTS= TestDirManip.exe TestFuncMacro.exe TestHeaders.exe TestIntegers.exe TestLargeFiles.exe TestUnusedVars.exe TestVariadicMacros.exe
SRCS = charmonize.c src\Charmonizer\Probe.c src\Charmonizer\Core\Compiler.c src\Charmonizer\Core\ConfWriter.c src\Charmonizer\Core\Dir.c src\Charmonizer\Core\HeaderChecker.c src\Charmonizer\Core\OperatingSystem.c src\Charmonizer\Core\Stat.c src\Charmonizer\Core\Util.c src\Charmonizer\Probe\AtomicOps.c src\Charmonizer\Probe\DirManip.c src\Charmonizer\Probe\Floats.c src\Charmonizer\Probe\FuncMacro.c src\Charmonizer\Probe\Headers.c src\Charmonizer\Probe\Integers.c src\Charmonizer\Probe\LargeFiles.c src\Charmonizer\Probe\Memory.c src\Charmonizer\Probe\UnusedVars.c src\Charmonizer\Probe\VariadicMacros.c
@@ -32,6 +33,30 @@ all: $(PROGNAME)
$(PROGNAME) : $(OBJS)
$(LINKER) $(OBJS) /OUT:$(PROGNAME) $(LIBS)
+tests: $(TESTS)
+
+TestDirManip.exe: src\Charmonizer\Test.obj src/Charmonizer\Test\TestDirManip.obj
+ $(LINKER) src\Charmonizer\Test.obj src/Charmonizer\Test\TestDirManip.obj $(LIBS) /OUT:$@ $(LIBS)
+
+TestFuncMacro.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestFuncMacro.obj
+ $(LINKER) src\Charmonizer\Test.obj src/Charmonizer/Test/TestFuncMacro.obj /OUT:$@ $(LIBS)
+
+TestHeaders.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestHeaders.obj
+ $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestHeaders.obj /OUT:$@ $(LIBS)
+
+TestIntegers.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestIntegers.obj
+ $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestIntegers.obj /OUT:$@ $(LIBS)
+
+TestLargeFiles.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestLargeFiles.obj
+ $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestLargeFiles.obj /OUT:$@ $(LIBS)
+
+TestUnusedVars.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestUnusedVars.obj
+ $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestUnusedVars.obj /OUT:$@ $(LIBS)
+
+TestVariadicMacros.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestVariadicMacros.obj
+ $(LINKER) src\Charmonizer\Test.obj src\Charmonizer\Test\TestVariadicMacros.obj /OUT:$@ $(LIBS)
+
+
clean:
- del $(OBJS) $(PROGNAME) core
+ del $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) core