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

Let the Configure instance be private (1/3)

Browse Source
This commit is contained in:
Pierre Pronchery 2017-11-09 03:40:10 +01:00
parent 11980fa1b5
commit 65845e94d9
3 changed files with 68 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/configure.c
View File

@ -478,6 +478,38 @@ ConfigurePrefs const * configure_get_prefs(Configure * configure)
} }
/* configure_get_program */
String const * configure_get_program(Configure * configure, String const * name)
{
/* XXX use a configuration file instead */
if(string_compare(name, "AR") == 0)
return configure->programs.ar;
else if(string_compare(name, "AS") == 0)
return configure->programs.as;
else if(string_compare(name, "CC") == 0)
return configure->programs.cc;
else if(string_compare(name, "CCSHARED") == 0)
return configure->programs.ccshared;
else if(string_compare(name, "CXX") == 0)
return configure->programs.cxx;
else if(string_compare(name, "INSTALL") == 0)
return configure->programs.install;
else if(string_compare(name, "LIBTOOL") == 0)
return configure->programs.libtool;
else if(string_compare(name, "LN") == 0)
return configure->programs.ln;
else if(string_compare(name, "MKDIR") == 0)
return configure->programs.mkdir;
else if(string_compare(name, "RANLIB") == 0)
return configure->programs.ranlib;
else if(string_compare(name, "RM") == 0)
return configure->programs.rm;
else if(string_compare(name, "TAR") == 0)
return configure->programs.tar;
return "";
}
/* configure_get_soext */ /* configure_get_soext */
String const * configure_get_soext(Configure * configure) String const * configure_get_soext(Configure * configure)
{ {

2
src/configure.h
View File

@ -182,6 +182,8 @@ String const * configure_get_config(Configure * configure,
String const * configure_get_exeext(Configure * configure); String const * configure_get_exeext(Configure * configure);
HostOS configure_get_os(Configure * configure); HostOS configure_get_os(Configure * configure);
ConfigurePrefs const * configure_get_prefs(Configure * configure); ConfigurePrefs const * configure_get_prefs(Configure * configure);
String const * configure_get_program(Configure * configure,
String const * name);
String const * configure_get_soext(Configure * configure); String const * configure_get_soext(Configure * configure);
unsigned int configure_is_flag_set(Configure * configure, unsigned int flags); unsigned int configure_is_flag_set(Configure * configure, unsigned int flags);

65
src/makefile.c
View File

@ -60,8 +60,10 @@ static int _makefile_is_phony(Configure * configure, char const * target);
static int _makefile_expand(FILE * fp, char const * field); static int _makefile_expand(FILE * fp, char const * field);
static int _makefile_link(FILE * fp, int symlink, char const * link, static int _makefile_link(FILE * fp, int symlink, char const * link,
char const * path); char const * path);
static int _makefile_output_variable(FILE * fp, char const * name, static int _makefile_output_program(Configure * configure, FILE * fp,
char const * value); String const * name);
static int _makefile_output_variable(FILE * fp, String const * name,
String const * value);
static int _makefile_mkdir(FILE * fp, char const * directory); static int _makefile_mkdir(FILE * fp, char const * directory);
static int _makefile_print(FILE * fp, char const * format, ...); static int _makefile_print(FILE * fp, char const * format, ...);
static int _makefile_remove(FILE * fp, int recursive, ...); static int _makefile_remove(FILE * fp, int recursive, ...);
@ -274,12 +276,9 @@ static int _variables_dist(Configure * configure, FILE * fp)
_makefile_output_variable(fp, "DESTDIR", _makefile_output_variable(fp, "DESTDIR",
prefs->destdir); prefs->destdir);
} }
_makefile_output_variable(fp, "MKDIR", _makefile_output_program(configure, fp, "MKDIR");
configure->programs.mkdir); _makefile_output_program(configure, fp, "INSTALL");
_makefile_output_variable(fp, "INSTALL", _makefile_output_program(configure, fp, "RM");
configure->programs.install);
_makefile_output_variable(fp, "RM",
configure->programs.rm);
break; break;
} }
if(c == '\0') if(c == '\0')
@ -442,22 +441,19 @@ static int _variables_executables(Configure * configure, FILE * fp)
} }
if(targets != NULL || includes != NULL || package != NULL) if(targets != NULL || includes != NULL || package != NULL)
{ {
_makefile_output_variable(fp, "RM", configure->programs.rm); _makefile_output_program(configure, fp, "RM");
_makefile_output_variable(fp, "LN", configure->programs.ln); _makefile_output_program(configure, fp, "LN");
} }
if(package != NULL) if(package != NULL)
{ {
_makefile_output_variable(fp, "TAR", configure->programs.tar); _makefile_output_program(configure, fp, "TAR");
_makefile_output_variable(fp, "MKDIR", _makefile_output_program(configure, fp, "MKDIR");
configure->programs.mkdir);
} }
if(targets != NULL || includes != NULL) if(targets != NULL || includes != NULL)
{ {
if(package == NULL) if(package == NULL)
_makefile_output_variable(fp, "MKDIR", _makefile_output_program(configure, fp, "MKDIR");
configure->programs.mkdir); _makefile_output_program(configure, fp, "INSTALL");
_makefile_output_variable(fp, "INSTALL",
configure->programs.install);
} }
return 0; return 0;
} }
@ -571,7 +567,7 @@ static void _targets_asflags(Configure * configure, FILE * fp)
if(as != NULL || asff != NULL || asf != NULL) if(as != NULL || asff != NULL || asf != NULL)
{ {
_makefile_output_variable(fp, "AS", (as != NULL) ? as _makefile_output_variable(fp, "AS", (as != NULL) ? as
: configure->programs.as); : configure_get_program(configure, "AS"));
_makefile_output_variable(fp, "ASFLAGSF", asff); _makefile_output_variable(fp, "ASFLAGSF", asff);
_makefile_output_variable(fp, "ASFLAGS", asf); _makefile_output_variable(fp, "ASFLAGS", asf);
} }
@ -595,7 +591,7 @@ static void _targets_cflags(Configure * configure, FILE * fp)
&& cc == NULL) && cc == NULL)
return; return;
if(cc == NULL) if(cc == NULL)
_makefile_output_variable(fp, "CC", configure->programs.cc); _makefile_output_program(configure, fp, "CC");
else else
_makefile_output_variable(fp, "CC", cc); _makefile_output_variable(fp, "CC", cc);
_makefile_output_variable(fp, "CPPFLAGSF", cppf); _makefile_output_variable(fp, "CPPFLAGSF", cppf);
@ -626,7 +622,7 @@ static void _targets_cxxflags(Configure * configure, FILE * fp)
if(cxx != NULL || cxxff != NULL || cxxf != NULL) if(cxx != NULL || cxxff != NULL || cxxf != NULL)
{ {
if(cxx == NULL) if(cxx == NULL)
cxx = configure->programs.cxx; cxx = configure_get_program(configure, "CXX");
_makefile_output_variable(fp, "CXX", cxx); _makefile_output_variable(fp, "CXX", cxx);
} }
if(cxxff != NULL) if(cxxff != NULL)
@ -790,8 +786,7 @@ static void _variables_library(Configure * configure, FILE * fp, char * done)
if(configure_can_library_static(configure)) if(configure_can_library_static(configure))
_variables_library_static(configure, fp); _variables_library_static(configure, fp);
if((p = _makefile_get_config(configure, NULL, "ld")) == NULL) if((p = _makefile_get_config(configure, NULL, "ld")) == NULL)
_makefile_output_variable(fp, "CCSHARED", _makefile_output_program(configure, fp, "CCSHARED");
configure->programs.ccshared);
else else
_makefile_output_variable(fp, "CCSHARED", p); _makefile_output_variable(fp, "CCSHARED", p);
_makefile_output_variable(fp, "SOEXT", configure_get_soext(configure)); _makefile_output_variable(fp, "SOEXT", configure_get_soext(configure));
@ -802,13 +797,12 @@ static void _variables_library_static(Configure * configure, FILE * fp)
String const * p; String const * p;
if((p = _makefile_get_config(configure, NULL, "ar")) == NULL) if((p = _makefile_get_config(configure, NULL, "ar")) == NULL)
_makefile_output_variable(fp, "AR", configure->programs.ar); _makefile_output_program(configure, fp, "AR");
else else
_makefile_output_variable(fp, "AR", p); _makefile_output_variable(fp, "AR", p);
_makefile_output_variable(fp, "ARFLAGS", "-rc"); _makefile_output_variable(fp, "ARFLAGS", "-rc");
if((p = _makefile_get_config(configure, NULL, "ranlib")) == NULL) if((p = _makefile_get_config(configure, NULL, "ranlib")) == NULL)
_makefile_output_variable(fp, "RANLIB", _makefile_output_program(configure, fp, "RANLIB");
configure->programs.ranlib);
else else
_makefile_output_variable(fp, "RANLIB", p); _makefile_output_variable(fp, "RANLIB", p);
} }
@ -822,8 +816,7 @@ static void _variables_libtool(Configure * configure, FILE * fp, char * done)
{ {
if((p = _makefile_get_config(configure, NULL, "libtool")) if((p = _makefile_get_config(configure, NULL, "libtool"))
== NULL) == NULL)
_makefile_output_variable(fp, "LIBTOOL", _makefile_output_program(configure, fp, "LIBTOOL");
configure->programs.libtool);
else else
_makefile_output_variable(fp, "LIBTOOL", p); _makefile_output_variable(fp, "LIBTOOL", p);
} }
@ -888,8 +881,7 @@ static int _variables_subdirs(Configure * configure, FILE * fp)
if(q != NULL) if(q != NULL)
return 0; return 0;
} }
return _makefile_output_variable(fp, "MKDIR", return _makefile_output_program(configure, fp, "MKDIR");
configure->programs.mkdir);
} }
static int _targets_all(Configure * configure, FILE * fp); static int _targets_all(Configure * configure, FILE * fp);
@ -2815,9 +2807,20 @@ static int _makefile_link(FILE * fp, int symlink, char const * link,
} }
/* makefile_output_program */
static int _makefile_output_program(Configure * configure, FILE * fp,
String const * name)
{
String const * value;
value = configure_get_program(configure, name);
return _makefile_output_variable(fp, name, value);
}
/* makefile_output_variable */ /* makefile_output_variable */
static int _makefile_output_variable(FILE * fp, char const * name, static int _makefile_output_variable(FILE * fp, String const * name,
char const * value) String const * value)
{ {
int res; int res;
char const * align; char const * align;