DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for spaces in filenames (8/x)

Browse Source 
This takes care of Verilog objects.

GNU Make is required for this to work.
This commit is contained in:
Pierre Pronchery 2019-02-20 17:37:31 +01:00
parent abf427cc67
commit e53e2cb239
1 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/makefile.c
View File

@ -1052,8 +1052,9 @@ static int _objs_source(Makefile * makefile, String * source, TargetType tt)
_makefile_print(makefile, "%s", ".class"); _makefile_print(makefile, "%s", ".class");
break; break;
case OT_VERILOG_SOURCE: case OT_VERILOG_SOURCE:
_makefile_print(makefile, "%s%s%s", " $(OBJDIR)", _makefile_print(makefile, "%s", " $(OBJDIR)");
source, ".o"); _makefile_print_escape(makefile, source);
_makefile_print(makefile, "%s", ".o");
break; break;
case OT_UNKNOWN: case OT_UNKNOWN:
ret = 1; ret = 1;
@ -1266,7 +1267,8 @@ static void _flags_verilog(Makefile * makefile, String const * target)
{ {
String const * p; String const * p;
_makefile_print(makefile, "%s%s", target, _makefile_print_escape_variable(makefile, target);
_makefile_print(makefile, "%s",
"_VFLAGS = $(VFLAGSF) $(VFLAGS)"); "_VFLAGS = $(VFLAGSF) $(VFLAGS)");
if((p = _makefile_get_config(makefile, target, "vflags")) != NULL) if((p = _makefile_get_config(makefile, target, "vflags")) != NULL)
_makefile_print(makefile, " %s", p); _makefile_print(makefile, " %s", p);
@ -1543,10 +1545,14 @@ static int _target_object(Makefile * makefile, String const * target)
_makefile_print(makefile, "\n"); _makefile_print(makefile, "\n");
break; break;
case OT_VERILOG_SOURCE: case OT_VERILOG_SOURCE:
_makefile_print(makefile, "\n%s%s%s%s\n%s%s", _makefile_print(makefile, "\n");
target, "_OBJS = ", _makefile_print_escape_variable(makefile, target);
"$(OBJDIR)", target, target, "_VFLAGS =" _makefile_print(makefile, "%s", "_OBJS = $(OBJDIR)");
" $(VFLAGSF) $(VFLAGS)"); _makefile_print_escape(makefile, target);
_makefile_print(makefile, "\n");
_makefile_print_escape_variable(makefile, target);
_makefile_print(makefile, "%s",
"_VFLAGS = $(VFLAGSF) $(VFLAGS)");
if((p = _makefile_get_config(makefile, target, if((p = _makefile_get_config(makefile, target,
"vflags")) != NULL) "vflags")) != NULL)
_makefile_print(makefile, " %s", p); _makefile_print(makefile, " %s", p);
@ -1987,32 +1993,47 @@ static int _target_source(Makefile * makefile, String const * target,
break; break;
case OT_VERILOG_SOURCE: case OT_VERILOG_SOURCE:
if(tt == TT_OBJECT) if(tt == TT_OBJECT)
_makefile_print(makefile, "%s%s", "\n$(OBJDIR)", {
target); _makefile_print(makefile, "%s", "\n$(OBJDIR)");
_makefile_print_escape(makefile, target);
}
else else
_makefile_print(makefile, "%s%s%s", "\n$(OBJDIR)", {
source, ".o"); _makefile_print(makefile, "%s", "\n$(OBJDIR)");
_makefile_print(makefile, "%s%s%s%s", ": ", source, ".", _makefile_print_escape(makefile, source);
extension); _makefile_print(makefile, ".o");
}
_makefile_print(makefile, ": ");
_makefile_print_escape(makefile, source);
_makefile_print(makefile, ".%s", extension);
source[len] = '.'; /* FIXME ugly */ source[len] = '.'; /* FIXME ugly */
_source_depends(makefile, source); _source_depends(makefile, source);
_makefile_print(makefile, "%s", "\n\t"); _makefile_print(makefile, "\n\t");
if(strchr(source, '/') != NULL) if(strchr(source, '/') != NULL)
ret = _source_subdir(makefile, source); ret = _source_subdir(makefile, source);
q = _makefile_get_config(makefile, source, "vflags"); q = _makefile_get_config(makefile, source, "vflags");
source[len] = '\0'; source[len] = '\0';
_makefile_print(makefile, "%s%s%s", "$(VERILOG) $(", _makefile_print(makefile, "%s", "$(VERILOG) $(");
target, "_VFLAGS)"); _makefile_print_escape_variable(makefile, target);
_makefile_print(makefile, "%s", "_VFLAGS)");
if(q != NULL) if(q != NULL)
_makefile_print(makefile, " %s", q); _makefile_print(makefile, " %s", q);
if(tt == TT_OBJECT) if(tt == TT_OBJECT)
_makefile_print(makefile, "%s%s", {
" -o $(OBJDIR)", target); _makefile_print(makefile, "%s",
" -o $(OBJDIR)");
_makefile_print_escape(makefile, target);
}
else else
_makefile_print(makefile, "%s%s%s", {
" -o $(OBJDIR)", source, ".o"); _makefile_print(makefile, "%s",
_makefile_print(makefile, "%s%s%s%s%c", " ", source, " -o $(OBJDIR)");
".", extension, '\n'); _makefile_print_escape(makefile, source);
_makefile_print(makefile, ".o");
}
_makefile_print(makefile, " ");
_makefile_print_escape(makefile, source);
_makefile_print(makefile, "%s%s\n", ".", extension);
break; break;
case OT_UNKNOWN: case OT_UNKNOWN:
fprintf(stderr, "%s%s%s", PROGNAME ": ", target, fprintf(stderr, "%s%s%s", PROGNAME ": ", target,