You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2014/07/24 14:00:22 UTC

git commit: refs/heads/master - Regenerate charmonizer.c to fix BSD make

Repository: lucy
Updated Branches:
  refs/heads/master b6ccb300b -> 605f35063


Regenerate charmonizer.c to fix BSD make


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

Branch: refs/heads/master
Commit: 605f35063c686cca979f157ecc5dd0a0d8a302e9
Parents: b6ccb30
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Thu Jul 24 13:57:22 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Thu Jul 24 13:57:22 2014 +0200

----------------------------------------------------------------------
 common/charmonizer.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/605f3506/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index e811bc1..05c954d 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -4166,16 +4166,14 @@ chaz_MakeFile_write(chaz_MakeFile *makefile) {
     S_write_rule(makefile->clean, out);
     S_write_rule(makefile->distclean, out);
 
-    if (chaz_Make.is_nmake) {
-        /* Inference rule for .c files. */
-        if (chaz_CC_msvc_version_num()) {
-            fprintf(out, ".c.obj :\n");
-            fprintf(out, "\t$(CC) /nologo $(CFLAGS) /c $< /Fo$@\n\n");
-        }
-        else {
-            fprintf(out, ".c.o :\n");
-            fprintf(out, "\t$(CC) $(CFLAGS) -c $< -o $@\n\n");
-        }
+    /* Suffix rule for .c files. */
+    if (chaz_CC_msvc_version_num()) {
+        fprintf(out, ".c.obj :\n");
+        fprintf(out, "\t$(CC) /nologo $(CFLAGS) /c $< /Fo$@\n\n");
+    }
+    else {
+        fprintf(out, ".c.o :\n");
+        fprintf(out, "\t$(CC) $(CFLAGS) -c $< -o $@\n\n");
     }
 
     fclose(out);