lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] [3/3] git commit: Regenerate Makefiles
Date Mon, 17 Mar 2014 22:11:25 GMT
Regenerate Makefiles


Project: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/commit/c491b2ac
Tree: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/tree/c491b2ac
Diff: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/diff/c491b2ac

Branch: refs/heads/master
Commit: c491b2ac833e6899ca91d3f15f5edfcfe78b92bb
Parents: ec35c04
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Mon Mar 17 23:10:34 2014 +0100
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Mon Mar 17 23:10:34 2014 +0100

----------------------------------------------------------------------
 Makefile       | 42 +++++++++---------------------------------
 Makefile.MSVC  | 21 ++++++++++++++++-----
 Makefile.MinGW | 21 ++++++++++++++++-----
 3 files changed, 41 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/c491b2ac/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index b2863f4..3d4296f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# GENERATED BY gen_charmonizer_makefiles.pl: do not hand-edit!!!
+# GENERATED BY gen_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
@@ -17,7 +17,7 @@
 
 CC= cc
 DEFS=
-CFLAGS= -I. -Isrc $(DEFS)
+CFLAGS= -I. -Isrc $(DEFS) 
 PROGNAME= charmonize
 CHARMONY_H= charmony.h
 PROBES=
@@ -27,50 +27,25 @@ PERL=/usr/bin/perl
 
 TESTS= TestDirManip TestFuncMacro TestHeaders TestIntegers TestLargeFiles TestUnusedVars
TestVariadicMacros
 
-OBJS= \
-    charmonize.o \
-    src/Charmonizer/Core/CFlags.o \
-    src/Charmonizer/Core/Compiler.o \
-    src/Charmonizer/Core/ConfWriter.o \
-    src/Charmonizer/Core/ConfWriterC.o \
-    src/Charmonizer/Core/ConfWriterPerl.o \
-    src/Charmonizer/Core/ConfWriterPython.o \
-    src/Charmonizer/Core/ConfWriterRuby.o \
-    src/Charmonizer/Core/HeaderChecker.o \
-    src/Charmonizer/Core/Make.o \
-    src/Charmonizer/Core/OperatingSystem.o \
-    src/Charmonizer/Core/SharedLibrary.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/Booleans.o \
-    src/Charmonizer/Probe/Integers.o \
-    src/Charmonizer/Probe/LargeFiles.o \
-    src/Charmonizer/Probe/Memory.o \
-    src/Charmonizer/Probe/SymbolVisibility.o \
-    src/Charmonizer/Probe/UnusedVars.o \
-    src/Charmonizer/Probe/VariadicMacros.o
+OBJS= charmonize.o src/Charmonizer/Core/CFlags.o src/Charmonizer/Core/Compiler.o src/Charmonizer/Core/ConfWriter.o
src/Charmonizer/Core/ConfWriterC.o src/Charmonizer/Core/ConfWriterPerl.o src/Charmonizer/Core/ConfWriterPython.o
src/Charmonizer/Core/ConfWriterRuby.o src/Charmonizer/Core/HeaderChecker.o src/Charmonizer/Core/Make.o
src/Charmonizer/Core/OperatingSystem.o src/Charmonizer/Core/SharedLibrary.o src/Charmonizer/Core/Util.o
src/Charmonizer/Probe.o src/Charmonizer/Probe/AtomicOps.o src/Charmonizer/Probe/Booleans.o
src/Charmonizer/Probe/BuildEnv.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/RegularExpressions.o
src/Charmonizer/Probe/Strings.o src/Charmonizer/Probe/SymbolVisibility.o src/Charmonizer/Probe/UnusedVars.o
src/Charmonizer/Probe/VariadicMacros.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
 
-HEADERS= src/Charmonizer/Core/Compiler.h src/Charmonizer/Core/ConfWriter.h src/Charmonizer/Core/ConfWriterC.h
src/Charmonizer/Core/ConfWriterPerl.h src/Charmonizer/Core/ConfWriterRuby.h src/Charmonizer/Core/Defines.h
src/Charmonizer/Core/HeaderChecker.h src/Charmonizer/Core/OperatingSystem.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/SymbolVisibility.h src/Charmonizer/Probe/UnusedVars.h src/Charmonizer/Probe/VariadicMacros.h
src/Charmonizer/Test.h
+HEADERS= src/Charmonizer/Core/CFlags.h src/Charmonizer/Core/Compiler.h src/Charmonizer/Core/ConfWriter.h
src/Charmonizer/Core/ConfWriterC.h src/Charmonizer/Core/ConfWriterPerl.h src/Charmonizer/Core/ConfWriterPython.h
src/Charmonizer/Core/ConfWriterRuby.h src/Charmonizer/Core/Defines.h src/Charmonizer/Core/HeaderChecker.h
src/Charmonizer/Core/Make.h src/Charmonizer/Core/OperatingSystem.h src/Charmonizer/Core/SharedLibrary.h
src/Charmonizer/Core/Util.h src/Charmonizer/Probe.h src/Charmonizer/Probe/AtomicOps.h src/Charmonizer/Probe/Booleans.h
src/Charmonizer/Probe/BuildEnv.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/RegularExpressions.h
src/Charmonizer/Probe/Strings.h src/Charmonizer/Probe/SymbolVisibility.h src/Charmonizer/Probe/UnusedVars.h
src/Charmonizer/Probe/VariadicMacros.
 h src/Charmonizer/Test.h
 
-CLEANABLE= $(OBJS) $(PROGNAME) $(CHARMONY_H) $(TEST_OBJS) $(TESTS)
+CLEANABLE= $(OBJS) $(PROGNAME) $(CHARMONY_H) $(TEST_OBJS) $(TESTS) 
 
 .c.o:
 	$(CC) $(CFLAGS) -c $*.c -o $@
 
 all: $(PROGNAME)
 
+meld:
+	$(PERL) buildbin/meld.pl --probes=$(PROBES) --files=$(FILES) --out=$(OUT)
+
 $(CHARMONY_H): $(PROGNAME)
 	./$(PROGNAME) --cc=$(CC) --enable-c
 
-meld:
-	$(PERL) buildbin/meld.pl --probes=$(PROBES) --files=$(FILES) --out=$(OUT)
 
 $(PROGNAME): $(OBJS)
 	$(CC) $(CFLAGS) $(OBJS) -o $(PROGNAME)
@@ -105,6 +80,7 @@ TestVariadicMacros: src/Charmonizer/Test.o src/Charmonizer/Test/TestVariadicMacr
 test: tests
 	prove ./Test*
 
+
 clean:
 	rm -f $(CLEANABLE)
 

http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/c491b2ac/Makefile.MSVC
----------------------------------------------------------------------
diff --git a/Makefile.MSVC b/Makefile.MSVC
index 95445d6..ab5d35e 100644
--- a/Makefile.MSVC
+++ b/Makefile.MSVC
@@ -1,4 +1,4 @@
-# GENERATED BY gen_charmonizer_makefiles.pl: do not hand-edit!!!
+# GENERATED BY gen_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
@@ -17,8 +17,9 @@
 
 CC= cl
 DEFS=
-CFLAGS= -Isrc $(DEFS) -nologo -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
+CFLAGS= -I. -Isrc $(DEFS) -nologo -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
 PROGNAME= charmonize.exe
+CHARMONY_H= charmony.h
 PROBES=
 FILES=
 OUT=
@@ -26,13 +27,13 @@ PERL=/usr/bin/perl
 
 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\ConfWriterC.obj src\Charmonizer\Core\ConfWriterPerl.obj src\Charmonizer\Core\ConfWriterRuby.obj
src\Charmonizer\Core\HeaderChecker.obj src\Charmonizer\Core\OperatingSystem.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\SymbolVisibility.obj src\Charmonizer\Probe\UnusedVars.obj src\Charmonizer\Probe\VariadicMacros.obj
+OBJS= charmonize.obj src\Charmonizer\Core\CFlags.obj src\Charmonizer\Core\Compiler.obj src\Charmonizer\Core\ConfWriter.obj
src\Charmonizer\Core\ConfWriterC.obj src\Charmonizer\Core\ConfWriterPerl.obj src\Charmonizer\Core\ConfWriterPython.obj
src\Charmonizer\Core\ConfWriterRuby.obj src\Charmonizer\Core\HeaderChecker.obj src\Charmonizer\Core\Make.obj
src\Charmonizer\Core\OperatingSystem.obj src\Charmonizer\Core\SharedLibrary.obj src\Charmonizer\Core\Util.obj
src\Charmonizer\Probe.obj src\Charmonizer\Probe\AtomicOps.obj src\Charmonizer\Probe\Booleans.obj
src\Charmonizer\Probe\BuildEnv.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\RegularExpressions.obj
src\Charmonizer\Probe\Strings.obj src\Charmonizer\Probe\SymbolVisibility.obj src\Charmonizer\Probe\UnusedVars.obj
sr
 c\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\ConfWriterC.h
src\Charmonizer\Core\ConfWriterPerl.h src\Charmonizer\Core\ConfWriterRuby.h src\Charmonizer\Core\Defines.h
src\Charmonizer\Core\HeaderChecker.h src\Charmonizer\Core\OperatingSystem.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\SymbolVisibility.h src\Charmonizer\Probe\UnusedVars.h src\Charmonizer\Probe\VariadicMacros.h
src\Charmonizer\Test.h
+HEADERS= src\Charmonizer\Core\CFlags.h src\Charmonizer\Core\Compiler.h src\Charmonizer\Core\ConfWriter.h
src\Charmonizer\Core\ConfWriterC.h src\Charmonizer\Core\ConfWriterPerl.h src\Charmonizer\Core\ConfWriterPython.h
src\Charmonizer\Core\ConfWriterRuby.h src\Charmonizer\Core\Defines.h src\Charmonizer\Core\HeaderChecker.h
src\Charmonizer\Core\Make.h src\Charmonizer\Core\OperatingSystem.h src\Charmonizer\Core\SharedLibrary.h
src\Charmonizer\Core\Util.h src\Charmonizer\Probe.h src\Charmonizer\Probe\AtomicOps.h src\Charmonizer\Probe\Booleans.h
src\Charmonizer\Probe\BuildEnv.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\RegularExpressions.h
src\Charmonizer\Probe\Strings.h src\Charmonizer\Probe\SymbolVisibility.h src\Charmonizer\Probe\UnusedVars.h
src\Charmonizer\Probe\VariadicMacros.
 h src\Charmonizer\Test.h
 
-CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) *.pdb
+CLEANABLE= $(OBJS) $(PROGNAME) $(CHARMONY_H) $(TEST_OBJS) $(TESTS) *.pdb
 
 .c.obj:
 	$(CC) $(CFLAGS) -c $< -Fo$@
@@ -42,11 +43,17 @@ all: $(PROGNAME)
 meld:
 	$(PERL) buildbin\meld.pl --probes=$(PROBES) --files=$(FILES) --out=$(OUT)
 
+$(CHARMONY_H): $(PROGNAME)
+	$(PROGNAME) --cc=$(CC) --enable-c
+
+
 $(PROGNAME): $(OBJS)
 	link -nologo $(OBJS) /OUT:$(PROGNAME)
 
 $(OBJS) $(TEST_OBJS): $(HEADERS)
 
+$(TEST_OBJS): $(CHARMONY_H)
+
 tests: $(TESTS)
 
 TestDirManip.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestDirManip.obj
@@ -70,6 +77,10 @@ TestUnusedVars.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestUnusedVars
 TestVariadicMacros.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestVariadicMacros.obj
 	link -nologo src\Charmonizer\Test\TestVariadicMacros.obj src\Charmonizer\Test.obj /OUT:$@
 
+test: tests
+	prove Test*
+
+
 clean:
 	CMD /c FOR %i IN ($(CLEANABLE)) DO IF EXIST %i DEL /F %i
 

http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/c491b2ac/Makefile.MinGW
----------------------------------------------------------------------
diff --git a/Makefile.MinGW b/Makefile.MinGW
index 3511043..707e806 100644
--- a/Makefile.MinGW
+++ b/Makefile.MinGW
@@ -1,4 +1,4 @@
-# GENERATED BY gen_charmonizer_makefiles.pl: do not hand-edit!!!
+# GENERATED BY gen_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
@@ -17,8 +17,9 @@
 
 CC= gcc
 DEFS=
-CFLAGS= -Isrc $(DEFS) 
+CFLAGS= -I. -Isrc $(DEFS) 
 PROGNAME= charmonize.exe
+CHARMONY_H= charmony.h
 PROBES=
 FILES=
 OUT=
@@ -26,13 +27,13 @@ PERL=/usr/bin/perl
 
 TESTS= TestDirManip.exe TestFuncMacro.exe TestHeaders.exe TestIntegers.exe TestLargeFiles.exe
TestUnusedVars.exe TestVariadicMacros.exe
 
-OBJS= charmonize.o src\Charmonizer\Core\Compiler.o src\Charmonizer\Core\ConfWriter.o src\Charmonizer\Core\ConfWriterC.o
src\Charmonizer\Core\ConfWriterPerl.o src\Charmonizer\Core\ConfWriterRuby.o src\Charmonizer\Core\HeaderChecker.o
src\Charmonizer\Core\OperatingSystem.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\SymbolVisibility.o
src\Charmonizer\Probe\UnusedVars.o src\Charmonizer\Probe\VariadicMacros.o
+OBJS= charmonize.o src\Charmonizer\Core\CFlags.o src\Charmonizer\Core\Compiler.o src\Charmonizer\Core\ConfWriter.o
src\Charmonizer\Core\ConfWriterC.o src\Charmonizer\Core\ConfWriterPerl.o src\Charmonizer\Core\ConfWriterPython.o
src\Charmonizer\Core\ConfWriterRuby.o src\Charmonizer\Core\HeaderChecker.o src\Charmonizer\Core\Make.o
src\Charmonizer\Core\OperatingSystem.o src\Charmonizer\Core\SharedLibrary.o src\Charmonizer\Core\Util.o
src\Charmonizer\Probe.o src\Charmonizer\Probe\AtomicOps.o src\Charmonizer\Probe\Booleans.o
src\Charmonizer\Probe\BuildEnv.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\RegularExpressions.o
src\Charmonizer\Probe\Strings.o src\Charmonizer\Probe\SymbolVisibility.o src\Charmonizer\Probe\UnusedVars.o
src\Charmonizer\Probe\VariadicMacros.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
 
-HEADERS= src\Charmonizer\Core\Compiler.h src\Charmonizer\Core\ConfWriter.h src\Charmonizer\Core\ConfWriterC.h
src\Charmonizer\Core\ConfWriterPerl.h src\Charmonizer\Core\ConfWriterRuby.h src\Charmonizer\Core\Defines.h
src\Charmonizer\Core\HeaderChecker.h src\Charmonizer\Core\OperatingSystem.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\SymbolVisibility.h src\Charmonizer\Probe\UnusedVars.h src\Charmonizer\Probe\VariadicMacros.h
src\Charmonizer\Test.h
+HEADERS= src\Charmonizer\Core\CFlags.h src\Charmonizer\Core\Compiler.h src\Charmonizer\Core\ConfWriter.h
src\Charmonizer\Core\ConfWriterC.h src\Charmonizer\Core\ConfWriterPerl.h src\Charmonizer\Core\ConfWriterPython.h
src\Charmonizer\Core\ConfWriterRuby.h src\Charmonizer\Core\Defines.h src\Charmonizer\Core\HeaderChecker.h
src\Charmonizer\Core\Make.h src\Charmonizer\Core\OperatingSystem.h src\Charmonizer\Core\SharedLibrary.h
src\Charmonizer\Core\Util.h src\Charmonizer\Probe.h src\Charmonizer\Probe\AtomicOps.h src\Charmonizer\Probe\Booleans.h
src\Charmonizer\Probe\BuildEnv.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\RegularExpressions.h
src\Charmonizer\Probe\Strings.h src\Charmonizer\Probe\SymbolVisibility.h src\Charmonizer\Probe\UnusedVars.h
src\Charmonizer\Probe\VariadicMacros.
 h src\Charmonizer\Test.h
 
-CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) 
+CLEANABLE= $(OBJS) $(PROGNAME) $(CHARMONY_H) $(TEST_OBJS) $(TESTS) 
 
 .c.o:
 	$(CC) $(CFLAGS) -c $*.c -o $@
@@ -42,11 +43,17 @@ all: $(PROGNAME)
 meld:
 	$(PERL) buildbin\meld.pl --probes=$(PROBES) --files=$(FILES) --out=$(OUT)
 
+$(CHARMONY_H): $(PROGNAME)
+	$(PROGNAME) --cc=$(CC) --enable-c
+
+
 $(PROGNAME): $(OBJS)
 	$(CC) $(CFLAGS) $(OBJS) -o $(PROGNAME)
 
 $(OBJS) $(TEST_OBJS): $(HEADERS)
 
+$(TEST_OBJS): $(CHARMONY_H)
+
 tests: $(TESTS)
 
 TestDirManip.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestDirManip.o
@@ -70,6 +77,10 @@ TestUnusedVars.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestUnusedVars.o
 TestVariadicMacros.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestVariadicMacros.o
 	$(CC) $(CFLAGS) src\Charmonizer\Test\TestVariadicMacros.o src\Charmonizer\Test.o -o $@
 
+test: tests
+	prove Test*
+
+
 clean:
 	CMD /c FOR %i IN ($(CLEANABLE)) DO IF EXIST %i DEL /F %i
 


Mime
View raw message