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 05:42:49 UTC
[lucy-commits] svn commit: r1142370 - in /incubator/lucy/trunk: charmonizer/Makefile
charmonizer/Makefile.MSVC charmonizer/Makefile.MinGW
devel/bin/gen_charmonizer_makefiles.pl
Author: marvin
Date: Sun Jul 3 03:42:48 2011
New Revision: 1142370
URL: http://svn.apache.org/viewvc?rev=1142370&view=rev
Log:
Abstract out .c.o Makefile rule, put it back where it belongs with the rest of
the rules rather than jammed up top in the midst of the Makefile variable
assignments.
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=1142370&r1=1142369&r2=1142370&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile (original)
+++ incubator/lucy/trunk/charmonizer/Makefile Sun Jul 3 03:42:48 2011
@@ -19,9 +19,6 @@ CC= cc
DEFS=
CFLAGS= -Isrc $(DEFS)
-.c.o:
- $(CC) $(CFLAGS) -c $*.c -o $@
-
PROGNAME= charmonize
TESTS= TestDirManip TestFuncMacro TestHeaders TestIntegers TestLargeFiles TestUnusedVars TestVariadicMacros
@@ -34,6 +31,9 @@ HEADERS= src/Charmonizer/Core/Compiler.h
CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) *.pdb
+.c.o:
+ $(CC) $(CFLAGS) -c $*.c -o $@
+
all: $(PROGNAME)
$(PROGNAME): $(OBJS)
Modified: incubator/lucy/trunk/charmonizer/Makefile.MSVC
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.MSVC?rev=1142370&r1=1142369&r2=1142370&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.MSVC (original)
+++ incubator/lucy/trunk/charmonizer/Makefile.MSVC Sun Jul 3 03:42:48 2011
@@ -19,9 +19,6 @@ CC= cl
DEFS=
CFLAGS= -Isrc -nologo -D_CRT_SECURE_NO_WARNINGS $(DEFS)
-.c.obj:
- $(CC) $(CFLAGS) -c $< -Fo$@
-
PROGNAME= charmonize.exe
TESTS= TestDirManip.exe TestFuncMacro.exe TestHeaders.exe TestIntegers.exe TestLargeFiles.exe TestUnusedVars.exe TestVariadicMacros.exe
@@ -34,6 +31,9 @@ HEADERS= src\Charmonizer\Core\Compiler.h
CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) *.pdb
+.c.obj:
+ $(CC) $(CFLAGS) -c $< -Fo$@
+
all: $(PROGNAME)
$(PROGNAME): $(OBJS)
Modified: incubator/lucy/trunk/charmonizer/Makefile.MinGW
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.MinGW?rev=1142370&r1=1142369&r2=1142370&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.MinGW (original)
+++ incubator/lucy/trunk/charmonizer/Makefile.MinGW Sun Jul 3 03:42:48 2011
@@ -19,9 +19,6 @@ CC= gcc
DEFS=
CFLAGS= -Isrc $(DEFS)
-.c.o:
- $(CC) $(CFLAGS) -c $*.c -o $@
-
PROGNAME= charmonize.exe
TESTS= TestDirManip.exe TestFuncMacro.exe TestHeaders.exe TestIntegers.exe TestLargeFiles.exe TestUnusedVars.exe TestVariadicMacros.exe
@@ -34,6 +31,9 @@ HEADERS= src\Charmonizer\Core\Compiler.h
CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) *.pdb
+.c.o:
+ $(CC) $(CFLAGS) -c $*.c -o $@
+
all: $(PROGNAME)
$(PROGNAME): $(OBJS)
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=1142370&r1=1142369&r2=1142370&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl (original)
+++ incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl Sun Jul 3 03:42:48 2011
@@ -102,6 +102,10 @@ sub build_link_command {
return "\$(CC) \$(CFLAGS) $objects -o $args{target}";
}
+sub c2o_rule {
+ qq|.c.o:\n\t\$(CC) \$(CFLAGS) -c \$*.c -o \$@|;
+}
+
sub test_block {
my ( $self, $c_test_case ) = @_;
my $exe = $self->execify($c_test_case);
@@ -132,6 +136,7 @@ sub gen_makefile {
objects => ['$(OBJS)'],
target => '$(PROGNAME)',
);
+ my $c2o_rule = $self->c2o_rule;
my $content = <<EOT;
# GENERATED BY $FindBin::Script: do not hand-edit!!!
@@ -163,6 +168,8 @@ HEADERS= $args{headers}
CLEANABLE= \$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) *.pdb
+$c2o_rule
+
all: \$(PROGNAME)
\$(PROGNAME): \$(OBJS)
@@ -219,9 +226,6 @@ sub top {
CC= cc
DEFS=
CFLAGS= -Isrc \$(DEFS)
-
-.c.o:
-\t\$(CC) \$(CFLAGS) -c \$*.c -o \$@
END_STUFF
}
@@ -247,12 +251,13 @@ sub top {
CC= cl
DEFS=
CFLAGS= -Isrc -nologo -D_CRT_SECURE_NO_WARNINGS \$(DEFS)
-
-.c.obj:
-\t\$(CC) \$(CFLAGS) -c \$< -Fo\$@
END_STUFF
}
+sub c2o_rule {
+ qq|.c.obj:\n\t\$(CC) \$(CFLAGS) -c \$< -Fo\$@|;
+}
+
sub build_link_command {
my ( $self, %args ) = @_;
my $objects = join( " ", @{ $args{objects} } );
@@ -280,9 +285,6 @@ sub top {
CC= gcc
DEFS=
CFLAGS= -Isrc \$(DEFS)
-
-.c.o:
-\t\$(CC) \$(CFLAGS) -c \$*.c -o \$@
END_STUFF
}