diff options
| author | Adam Mitz <mitza@ociweb.com> | 2015-03-09 09:34:31 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2015-03-09 09:34:31 -0500 |
| commit | ceb1c3b5d94ded8170ffe3b476d5d7c0ea831f27 (patch) | |
| tree | 4ea7c235ef80a26f0f68ed3b37c36fe1435f19f9 | |
| parent | ac6579d1373aef165e76bcec9f471eca058c3f3f (diff) | |
| parent | 421f5c292adc9de925aec7c3a51e4cd4904d288e (diff) | |
| download | ATCD-ceb1c3b5d94ded8170ffe3b476d5d7c0ea831f27.tar.gz | |
Merge pull request #26 from mitza-oci/master
Prevent running depgen twice during "make depend"
| -rw-r--r-- | ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm | 2 | ||||
| -rw-r--r-- | ACE/tests/.gitignore | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/.gitignore | 2 | ||||
| -rw-r--r-- | TAO/tests/Hello/.gitignore | 7 | ||||
| -rw-r--r-- | TAO/utils/nslist/.gitignore | 3 |
5 files changed, 13 insertions, 2 deletions
diff --git a/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm b/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm index d7e63a1ed83..ba664a183c2 100644 --- a/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm +++ b/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm @@ -99,7 +99,7 @@ sub write_comps { if ($named) { $self->write_named_targets($fh, $crlf, \%targnum, \@list, 'REMAINING_TARGETS := ' . - '$(filter-out all,$(TARGETS_NESTED:.nested=)) $(CUSTOM_TARGETS)' . + '$(filter-out all depend,$(TARGETS_NESTED:.nested=)) $(CUSTOM_TARGETS)' . "$crlf$crlf\$(REMAINING_TARGETS)", '', '', $self->project_target_translation(1), 1); } diff --git a/ACE/tests/.gitignore b/ACE/tests/.gitignore index 3fb4c3d8a60..f21f84dc116 100644 --- a/ACE/tests/.gitignore +++ b/ACE/tests/.gitignore @@ -111,6 +111,7 @@ /RB_Tree_Test /Reactor_Dispatch_Order_Test /Reactor_Exceptions_Test +/Reactor_Fairness_Test /Reactor_Notification_Queue_Test /Reactor_Notify_Test /Reactor_Performance_Test diff --git a/TAO/orbsvcs/ImplRepo_Service/.gitignore b/TAO/orbsvcs/ImplRepo_Service/.gitignore index b242352b30d..fb86511a763 100644 --- a/TAO/orbsvcs/ImplRepo_Service/.gitignore +++ b/TAO/orbsvcs/ImplRepo_Service/.gitignore @@ -24,3 +24,5 @@ /ServerObjectS.cpp /ServerObjectS.h /tao_imr +/tao_imr_activator +/tao_imr_locator diff --git a/TAO/tests/Hello/.gitignore b/TAO/tests/Hello/.gitignore index 414222416ff..9df5b54aa17 100644 --- a/TAO/tests/Hello/.gitignore +++ b/TAO/tests/Hello/.gitignore @@ -1,3 +1,8 @@ -/TestA.cpp /client /server +/TestA.cpp +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/utils/nslist/.gitignore b/TAO/utils/nslist/.gitignore index 9fc9e3a09b1..fb8a8177444 100644 --- a/TAO/utils/nslist/.gitignore +++ b/TAO/utils/nslist/.gitignore @@ -1,3 +1,6 @@ /nsadd /nsdel /nslist +/tao_nsadd +/tao_nsdel +/tao_nslist |