Print this page
make: unifdef for TEAMWARE_MAKE_CMN (defined)
@@ -287,13 +287,11 @@
Doname
doname(register Name target, register Boolean do_get, register Boolean implicit, register Boolean automatic)
{
Doname result = build_dont_know;
Chain out_of_date_list = NULL;
-#ifdef TEAMWARE_MAKE_CMN
Chain target_group;
-#endif
Property old_locals = NULL;
register Property line;
Property command = NULL;
register Dependency dependency;
Name less = NULL;
@@ -310,11 +308,10 @@
if (target->state == build_running) {
return build_running;
}
line = get_prop(target->prop, line_prop);
-#ifdef TEAMWARE_MAKE_CMN
if (line != NULL) {
/*
* If this target is a member of target group and one of the
* other members of the group is running, mark this target
* as running.
@@ -331,11 +328,10 @@
false);
return build_running;
}
}
}
-#endif
/*
* If the target is a constructed one for a "::" target,
* we need to consider that.
*/
if (target->has_target_prop) {
@@ -377,20 +373,18 @@
}
} else if (target->state == build_pending) {
target->state = build_dont_know;
restart = true;
/*
-#ifdef TEAMWARE_MAKE_CMN
} else if (parallel &&
keep_state &&
(target->conditional_cnt > 0)) {
if (!parallel_ok(target, false)) {
add_subtree(target, recursion_level, do_get, implicit);
target->state = build_running;
return build_running;
}
-#endif
*/
}
/*
* If KEEP_STATE is on, we have to rebuild the target if the
* building of it caused new automatic dependencies to be reported.
@@ -530,11 +524,10 @@
&command,
recheck_conditionals)) {
case build_failed:
result = build_failed;
break;
-#ifdef TEAMWARE_MAKE_CMN
case build_running:
target->state = build_running;
add_pending(target,
--recursion_level,
do_get,
@@ -546,11 +539,10 @@
get_prop(target->prop,
conditional_prop),
0);
}
return build_running;
-#endif
case build_ok:
result = build_ok;
break;
}
}
@@ -567,11 +559,10 @@
&command,
recheck_conditionals)) {
case build_failed:
result = build_failed;
break;
-#ifdef TEAMWARE_MAKE_CMN
case build_running:
target->state = build_running;
add_pending(target,
--recursion_level,
do_get,
@@ -583,11 +574,10 @@
get_prop(target->prop,
conditional_prop),
0);
}
return build_running;
-#endif
default:
/* ALWAYS bind $% for old style */
/* ar rules */
if (line == NULL) {
line =
@@ -603,11 +593,10 @@
&command,
recheck_conditionals)) {
case build_failed:
result = build_failed;
break;
-#ifdef TEAMWARE_MAKE_CMN
case build_running:
target->state = build_running;
add_pending(target,
--recursion_level,
do_get,
@@ -620,11 +609,10 @@
prop,
conditional_prop),
0);
}
return build_running;
-#endif
}
}
}
/* Look for single suffix rule */
@@ -653,11 +641,10 @@
&command,
recheck_conditionals)) {
case build_failed:
result = build_failed;
break;
-#ifdef TEAMWARE_MAKE_CMN
case build_running:
target->state = build_running;
add_pending(target,
--recursion_level,
do_get,
@@ -669,11 +656,10 @@
get_prop(target->prop,
conditional_prop),
0);
}
return build_running;
-#endif
}
}
/* Try to sccs get */
if ((command == NULL) &&
(result == build_dont_know) &&
@@ -743,11 +729,10 @@
if (result != build_failed) {
result = run_command(command,
(Boolean) ((parallel || save_parallel) && !silent));
}
switch (result) {
-#ifdef TEAMWARE_MAKE_CMN
case build_running:
add_running(target,
true_target,
command,
--recursion_level,
@@ -790,11 +775,10 @@
get_prop(target->prop,
conditional_prop),
0);
}
return build_running;
-#endif
case build_ok:
/* If all went OK set a nice timestamp */
if (true_target->stat.time == file_doesnt_exist) {
true_target->stat.time = file_max_time;
}
@@ -944,15 +928,11 @@
* recursion_level Used for tracing
* rewrite_statefile Set if .make.state needs rewriting
* wait_name The Name ".WAIT", compared against
*/
static Boolean
-#ifdef TEAMWARE_MAKE_CMN
check_dependencies(Doname *result, Property line, Boolean do_get, Name target, Name true_target, Boolean doing_subtree, Chain *out_of_date_tail, Property old_locals, Boolean implicit, Property *command, Name less, Boolean rechecking_target, Boolean recheck_conditionals)
-#else
-check_dependencies(Doname *result, Property line, Boolean do_get, Name target, Name true_target, Boolean, Chain *out_of_date_tail, Property, Boolean, Property *command, Name less, Boolean rechecking_target, Boolean recheck_conditionals)
-#endif
{
Boolean dependencies_running;
register Dependency dependency;
Doname dep_result;
Boolean dependency_changed = false;
@@ -1161,11 +1141,10 @@
file_max_time;
force->state = build_dont_know;
}
}
}
-#ifdef TEAMWARE_MAKE_CMN
if (dependencies_running) {
if (doing_subtree) {
if (target->conditional_cnt > 0) {
reset_locals(target,
old_locals,
@@ -1189,11 +1168,10 @@
0);
}
return true;
}
}
-#endif
/*
* Collect the timestamp of the youngest double colon target
* dependency.
*/
if (target->is_double_colon_parent) {
@@ -1613,15 +1591,11 @@
return build_ok;
}
/* If quest, then exit(1) because the target is out of date */
if (quest) {
if (posix) {
-#ifdef TEAMWARE_MAKE_CMN
result = execute_parallel(line, true);
-#else
- result = execute_serial(line);
-#endif
}
exit_status = 1;
exit(1);
}
/* We actually had to do something this time */
@@ -1697,22 +1671,17 @@
if (remember_only) {
/* Empty block!!! */
} else if (touch) {
result = touch_command(line, target, result);
if (posix) {
-#ifdef TEAMWARE_MAKE_CMN
result = execute_parallel(line, true);
-#else
- result = execute_serial(line);
-#endif
}
} else {
/*
* If this is not a touch run, we need to execute the
* proper command(s) for the target.
*/
-#ifdef TEAMWARE_MAKE_CMN
if (parallel) {
if (!parallel_ok(target, true)) {
/*
* We are building in parallel, but
* this target must be built in serial.
@@ -1720,15 +1689,11 @@
/*
* If nothing else is building,
* do this one, else wait.
*/
if (parallel_process_cnt == 0) {
-#ifdef TEAMWARE_MAKE_CMN
result = execute_parallel(line, true, target->localhost);
-#else
- result = execute_serial(line);
-#endif
} else {
current_target = NULL;
current_line = NULL;
/*
line->body.line.command_used = NULL;
@@ -1741,15 +1706,11 @@
switch (result) {
case build_running:
return build_running;
case build_serial:
if (parallel_process_cnt == 0) {
-#ifdef TEAMWARE_MAKE_CMN
result = execute_parallel(line, true, target->localhost);
-#else
- result = execute_serial(line);
-#endif
} else {
current_target = NULL;
current_line = NULL;
target->parallel = false;
line->body.line.command_used =
@@ -1757,19 +1718,12 @@
return build_serial;
}
}
}
} else {
-#endif
-#ifdef TEAMWARE_MAKE_CMN
result = execute_parallel(line, true, target->localhost);
-#else
- result = execute_serial(line);
-#endif
-#ifdef TEAMWARE_MAKE_CMN
}
-#endif
}
temp_file_name = NULL;
if (report_dependencies_level == 0){
update_target(line, result);
}