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

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2009-06-16 22:30:38 +00:00
parent dd86d44378
commit 08119c3d0a
1 changed files with 65 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/makefile.c
View File

@ -1358,17 +1358,12 @@ static int _dist_subdir_dist(FILE * fp, String const * path,
return 0; return 0;
} }
static int _install_target(Config * config, FILE * fp, String const * target); static int _install_targets(Configure * configure, FILE * fp);
static int _install_includes(Configure * configure, FILE * fp);
static int _install_include(Config * config, FILE * fp, String const * include); static int _install_include(Config * config, FILE * fp, String const * include);
static int _write_install(Configure * configure, FILE * fp) static int _write_install(Configure * configure, FILE * fp)
{ {
int ret = 0; int ret = 0;
String const * p;
String * targets;
String * q;
String * includes;
size_t i;
char c;
if(configure->prefs->flags & PREFS_n) if(configure->prefs->flags & PREFS_n)
return 0; return 0;
@ -1376,8 +1371,23 @@ static int _write_install(Configure * configure, FILE * fp)
if(config_get(configure->config, "", "subdirs") != NULL) if(config_get(configure->config, "", "subdirs") != NULL)
fputs("\t@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install)" fputs("\t@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install)"
" || exit; done\n", fp); " || exit; done\n", fp);
if((p = config_get(configure->config, "", "targets")) != NULL) ret |= _install_targets(configure, fp);
ret |= _install_includes(configure, fp);
return ret;
}
static int _install_target(Config * config, FILE * fp, String const * target);
static int _install_targets(Configure * configure, FILE * fp)
{ {
int ret = 0;
String const * p;
String * q;
String * targets;
size_t i;
char c;
if((p = config_get(configure->config, "", "targets")) == NULL)
return 0;
if((targets = string_new(p)) == NULL) if((targets = string_new(p)) == NULL)
return 1; return 1;
q = targets; q = targets;
@ -1394,27 +1404,6 @@ static int _write_install(Configure * configure, FILE * fp)
i = 0; i = 0;
} }
string_delete(q); string_delete(q);
}
if((p = config_get(configure->config, "", "includes")) != NULL)
{
if((includes = string_new(p)) == NULL)
return 1;
q = includes;
for(i = 0; ret == 0; i++)
{
if(includes[i] != ',' && includes[i] != '\0')
continue;
c = includes[i];
includes[i] = '\0';
ret |= _install_include(configure->config, fp,
includes);
if(c == '\0')
break;
includes += i + 1;
i = 0;
}
string_delete(q);
}
return ret; return ret;
} }
@ -1505,6 +1494,38 @@ static void _install_target_object(Config * config, FILE * fp,
" $(DESTDIR)", path, target); " $(DESTDIR)", path, target);
} }
static int _install_include(Config * config, FILE * fp, String const * include);
static int _install_includes(Configure * configure, FILE * fp)
{
int ret = 0;
String const * p;
String * q;
String * includes;
size_t i;
char c;
if((p = config_get(configure->config, "", "includes")) == NULL)
return 0;
if((includes = string_new(p)) == NULL)
return 1;
q = includes;
for(i = 0; ret == 0; i++)
{
if(includes[i] != ',' && includes[i] != '\0')
continue;
c = includes[i];
includes[i] = '\0';
ret |= _install_include(configure->config, fp,
includes);
if(c == '\0')
break;
includes += i + 1;
i = 0;
}
string_delete(q);
return ret;
}
static int _install_include(Config * config, FILE * fp, String const * include) static int _install_include(Config * config, FILE * fp, String const * include)
{ {
char const * install; char const * install;