From 506127ad1b262cc79d36febcc4dc03faa1f90f65 Mon Sep 17 00:00:00 2001
From: Adam Mitz <mitza@ociweb.com>
Date: Fri, 6 Mar 2015 17:07:53 -0600
Subject: Updated .gitignore files

---
 ACE/tests/.gitignore                    | 1 +
 TAO/orbsvcs/ImplRepo_Service/.gitignore | 2 ++
 TAO/tests/Hello/.gitignore              | 7 ++++++-
 TAO/utils/nslist/.gitignore             | 3 +++
 4 files changed, 12 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.1


From 421f5c292adc9de925aec7c3a51e4cd4904d288e Mon Sep 17 00:00:00 2001
From: Adam Mitz <mitza@ociweb.com>
Date: Fri, 6 Mar 2015 17:09:04 -0600
Subject: Prevent running depgen twice during "make depend"

---
 ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
   }
-- 
cgit v1.2.1