Repository: lucy-charmonizer
Updated Branches:
  refs/heads/master a636d73cf -> 9cc154147


Create suffix rule for all make variants

Hopefully fixes BSD make.


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

Branch: refs/heads/master
Commit: 3eef827ce2a937e74663e35ff8ab6489ab0e2c08
Parents: a636d73
Author: Nick Wellnhofer <[email protected]>
Authored: Thu Jul 24 13:50:20 2014 +0200
Committer: Nick Wellnhofer <[email protected]>
Committed: Thu Jul 24 13:50:20 2014 +0200

----------------------------------------------------------------------
 src/Charmonizer/Core/Make.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/3eef827c/src/Charmonizer/Core/Make.c
----------------------------------------------------------------------
diff --git a/src/Charmonizer/Core/Make.c b/src/Charmonizer/Core/Make.c
index 4d4bfde..ef385c7 100644
--- a/src/Charmonizer/Core/Make.c
+++ b/src/Charmonizer/Core/Make.c
@@ -482,16 +482,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);

Reply via email to