diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-08-03 15:08:00 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-08-03 15:08:00 +0000 |
| commit | e517a4920d0a26ec60d81e8f5fd0ed1291ae7367 (patch) | |
| tree | 9292533f0595fc9c4c65ef8c661b8ed405948957 | |
| parent | b30531b8472685b3ee96ffc1b8933fae07ecdce2 (diff) | |
| download | ATCD-e517a4920d0a26ec60d81e8f5fd0ed1291ae7367.tar.gz | |
mergeing in trunk
| -rw-r--r-- | modules/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm | 6 | ||||
| -rw-r--r-- | modules/ACE/bin/MakeProjectCreator/templates/gnu.mpd | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/modules/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm b/modules/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm index 47ef47cb3d2..c21cc166cce 100644 --- a/modules/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm +++ b/modules/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm @@ -64,12 +64,6 @@ sub fill_value { return ((defined $incs && $incs =~ /ciao/i) || (defined $libs && $libs =~ /ciao/i)); } - elsif ($name eq 'dds') { - my($incs) = $self->get_assignment('includes'); - my($libs) = $self->get_assignment('libpaths'); - return ((defined $incs && $incs =~ /dds/i) || - (defined $libs && $libs =~ /dds/i)); - } return undef; } diff --git a/modules/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/modules/ACE/bin/MakeProjectCreator/templates/gnu.mpd index 4390596c376..708f8255df5 100644 --- a/modules/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/modules/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -167,16 +167,14 @@ VSHDIR = <%targetoutdir%>.shobj/ <%endif%> include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -<%if(!dds && version)%> +<%if(version)%> ifeq ($(versioned_so),1) SOVERSION = .<%version%> endif # versioned_so <%endif%> -<%if(dds)%> -include $(DDS_ROOT)/rules.dds.GNU -<%endif%> +<%marker(extension)%> <%if(ciao)%> include $(CIAO_ROOT)/rules.ciao.GNU <%endif%> |