[lucy-commits] svn commit: r1141627 - in /incubator/lucy/trunk: charmonizer/Makefile charmonizer/base.POSIX.mk devel/bin/gen_charmonizer_makefiles.pl

[ma...@apache.org]

Author: marvin
Date: Thu Jun 30 17:08:19 2011
New Revision: 1141627

URL: http://svn.apache.org/viewvc?rev=1141627&view=rev
Log:
Change Charmonizer's main POSIX Makefile to have a structure similar to the
MinGW and MSVC Makefiles, with most of the functionality in a "base.POSIX.mk"
include file.

Added:
    incubator/lucy/trunk/charmonizer/Makefile   (with props)
    incubator/lucy/trunk/charmonizer/base.POSIX.mk
      - copied, changed from r1141339, incubator/lucy/trunk/charmonizer/Makefile
Modified:
    incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl

Added: incubator/lucy/trunk/charmonizer/Makefile
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile?rev=1141627&view=auto
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile (added)
+++ incubator/lucy/trunk/charmonizer/Makefile Thu Jun 30 17:08:19 2011
@@ -0,0 +1,31 @@
+# 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= cc
+DEFS=
+CFLAGS= -Isrc $(DEFS)
+OBJEXT= .o
+EXEEXT=
+LINKER= $(CC)
+LINKFLAGS= $(CFLAGS)
+LINKOUT= -o
+
+.c.o:
+	$(CC) $(CFLAGS) -c $*.c -o $@
+
+include base.POSIX.mk
+

Propchange: incubator/lucy/trunk/charmonizer/Makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/lucy/trunk/charmonizer/base.POSIX.mk (from r1141339, incubator/lucy/trunk/charmonizer/Makefile)
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/base.POSIX.mk?p2=incubator/lucy/trunk/charmonizer/base.POSIX.mk&p1=incubator/lucy/trunk/charmonizer/Makefile&r1=1141339&r2=1141627&rev=1141627&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile (original)
+++ incubator/lucy/trunk/charmonizer/base.POSIX.mk Thu Jun 30 17:08:19 2011
@@ -15,14 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CC= cc
-DEFS=
-CFLAGS= -Isrc $(DEFS)
-EXEEXT= 
-OBJEXT= .o
-LINKER= $(CC)
-LINKFLAGS = $(CFLAGS)
-LINKOUT= -o
 PROGNAME= charmonize$(EXEEXT)
 CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) core
 
@@ -34,9 +26,6 @@ TEST_OBJS= src/Charmonizer/Test$(OBJEXT)
 
 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.o:
-	$(CC) $(CFLAGS) -c $*.c -o $@
-
 all: $(PROGNAME)
 
 tests: $(TESTS)

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=1141627&r1=1141626&r2=1141627&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl (original)
+++ incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl Thu Jun 30 17:08:19 2011
@@ -83,19 +83,11 @@ EOT
 
 sub gen_makefile {
     my %args = @_;
-    open my $fh, ">Makefile" or die "open Makefile failed: $!\n";
+    open my $fh, ">base.POSIX.mk" or die "open base.POSIX.mk failed: $!\n";
     my $content = <<EOT;
 # GENERATED BY $FindBin::Script: do not hand-edit!!!
 #
 $license
-CC= cc
-DEFS=
-CFLAGS= -Isrc \$(DEFS)
-EXEEXT= 
-OBJEXT= .o
-LINKER= \$(CC)
-LINKFLAGS = \$(CFLAGS)
-LINKOUT= -o
 PROGNAME= charmonize\$(EXEEXT)
 CLEANABLE= \$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) core
 
@@ -107,9 +99,6 @@ TEST_OBJS= $args{test_objs}
 
 HEADERS= $args{headers}
 
-.c.o:
-	\$(CC) \$(CFLAGS) -c \$*.c -o \$@
-
 all: \$(PROGNAME)
 
 tests: \$(TESTS)