diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-07-15 11:27:11 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-07-15 11:27:11 +0000 |
| commit | 7fc9da47009b51c0086b5f48c2410ae104ec666b (patch) | |
| tree | 1395543e0f6a0279f756adcd5136d41ffa0bf0c1 | |
| parent | 1f3787bd06fcfdbda05381f938cdf2862367d795 (diff) | |
| download | MPC-7fc9da47009b51c0086b5f48c2410ae104ec666b.tar.gz | |
ChangeLogTag: Tue Jul 15 06:22:55 2003 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | modules/WorkspaceCreator.pm | 5 | ||||
| -rw-r--r-- | templates/make.mpd | 17 | ||||
| -rw-r--r-- | templates/makedll.mpt | 5 |
3 files changed, 16 insertions, 11 deletions
diff --git a/modules/WorkspaceCreator.pm b/modules/WorkspaceCreator.pm index 6e6ed9ab..70c85434 100644 --- a/modules/WorkspaceCreator.pm +++ b/modules/WorkspaceCreator.pm @@ -955,7 +955,7 @@ sub verify_build_ordering { my($projects) = $self->get_projects(); foreach my $project (@$projects) { - $self->get_validated_ordering($project); + $self->get_validated_ordering($project, 1); } } @@ -963,6 +963,7 @@ sub verify_build_ordering { sub get_validated_ordering { my($self) = shift; my($project) = shift; + my($warn) = shift; my($pjs) = $self->get_project_info(); my($name, $deps) = @{$$pjs{$project}}; @@ -980,7 +981,7 @@ sub get_validated_ordering { } } if (!$found) { - if (defined $ENV{MPC_VERBOSE_ORDERING}) { + if ($warn && defined $ENV{MPC_VERBOSE_ORDERING}) { print "WARNING: '$name' references '$dep' which has " . "not been processed\n"; } diff --git a/templates/make.mpd b/templates/make.mpd index d0eac06e..f9dc3ad2 100644 --- a/templates/make.mpd +++ b/templates/make.mpd @@ -20,18 +20,21 @@ SHLIB = lib<%sharedname%>.$(SOEXT) SOEXT = <%soext%> <%endfor%> <%foreach(configurations)%> +CPPFLAGS += <%pic%> +SHFLAGS = <%shflags%> +<%endfor%> +<%endif%> +<%foreach(configurations)%> <%if(cppflags)%> CPPFLAGS += <%cppflags%> <%endif%> +<%endfor%> <%if(zzip)%> CPPFLAGS += -I$(ZZIP_ROOT)/include -CPPFLAGS += <%foreach(zzip_defines)%> -D<%zzip_define%><%endfor%> +CPPFLAGS +=<%foreach(zzip_defines)%> -D<%zzip_define%><%endfor%> <%endif%> -<%endfor%> -<%foreach(configurations)%> -CPPFLAGS += <%pic%> -SHFLAGS = <%shflags%> -<%endfor%> +<%if(pch_header)%> +CPPFLAGS +=<%foreach(pch_defines)%> -D<%pch_define%><%endfor%> <%endif%> <%if(idl_files)%> IDL_FILES =<%foreach(idl_files)%> <%noextension(idl_file)%><%endfor%> @@ -169,7 +172,7 @@ $(DEPENDENCIES): touch $(DEPENDENCIES) depend: - perl <%depgen("$(ACE_ROOT)/bin/depgen.pl")%> -t gnu<%foreach(includes)%> -I<%include%><%endfor%><%foreach(macros)%> -D<%macro%><%endfor%><%if(pch_header)%><%foreach(pch_defines)%> -D<%pch_define%><%endfor%><%endif%> -f $(DEPENDENCIES)<%foreach(source_files)%> <%source_file%><%endfor%> + perl <%depgen("$(ACE_ROOT)/bin/depgen.pl")%> -t gnu $(CFLAGS) $(CCFLAGS) $(CPPFLAGS) -f $(DEPENDENCIES)<%foreach(source_files)%> <%source_file%><%endfor%> include $(DEPENDENCIES) <%marker(bottom)%> diff --git a/templates/makedll.mpt b/templates/makedll.mpt index 0ae2c4a9..8fb574e1 100644 --- a/templates/makedll.mpt +++ b/templates/makedll.mpt @@ -4,6 +4,7 @@ configurations = gcc soext = so ssl_libs = ssl crypto zzip_libs = z zziplib +cppflags = gcc { cxx = g++ @@ -12,7 +13,7 @@ gcc { platforms = linux } -CC { +SunCC { cxx = CC pic = -KPIC shflags = -G @@ -38,6 +39,6 @@ solaris { hpux { soext = sl ldlibs = -lxti -lpthread -lrt -ldld - } +} conditional_include "zziplib" |