summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/tests_svc_loader
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-11-17 18:20:13 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-11-17 18:20:13 +0000
commitd34d361da34f2315e39419bae8493e9c9d21b480 (patch)
tree9b4549f8bdb7ba8b8ff00e47ec335c08c2b0fedc /TAO/orbsvcs/tests/tests_svc_loader
parent26f00ad8f3831b4629fc2e1c96a838eb5ad31c5e (diff)
downloadATCD-d34d361da34f2315e39419bae8493e9c9d21b480.tar.gz
ChangeLogTag:Fri Nov 17 10:11:17 2000 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'TAO/orbsvcs/tests/tests_svc_loader')
-rw-r--r--TAO/orbsvcs/tests/tests_svc_loader/Makefile11
-rw-r--r--TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp8
2 files changed, 7 insertions, 12 deletions
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/Makefile b/TAO/orbsvcs/tests/tests_svc_loader/Makefile
index c745c2e223f..ce0821a0f09 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/Makefile
+++ b/TAO/orbsvcs/tests/tests_svc_loader/Makefile
@@ -15,20 +15,20 @@ endif
LDLIBS = -lTAO
ACE_SHLIBS = -lTAO -lACE
-PROG_SRCS = tests_svc_loader.cpp \
+PROG_SRCS = tests_svc_loader.cpp
SRC = $(PROG_SRCS)
-SIMPLE_CLI_OBJS = tests_svc_loader.o \
+SIMPLE_CLI_OBJS = tests_svc_loader.o
BIN2 = tests_svc_loader
#### If the TAO orbsvcs library wasn't built with sufficient components,
#### don't try to build here.
TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
+ifneq (minimum_corba,1)
BIN = $(BIN2)
-endif # Naming
+endif # minimum_corba
TAO_IDLFLAGS += -Ge 1
#----------------------------------------------------------------------------
@@ -58,9 +58,6 @@ tests_svc_loader: $(addprefix $(VDIR),$(SIMPLE_CLI_OBJS)) $(SHLIB)
$(BIN):
-realclean: clean
- -$(RM) $(foreach ext, $(IDL_EXT), Time_Date$(ext))
-
#----------------------------------------------------------------------------
# Dependencies
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
index 186f224b3d8..60b7eb6572e 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
+++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
@@ -22,12 +22,10 @@
//
// ============================================================================
-#include <iostream>
+#include "tao/corba.h"
+
#include "ace/Service_Config.h"
#include "ace/Log_Msg.h"
-#include "ace/pre.h"
-
-#include "tao/corba.h"
ACE_RCSID(tests_svc_loader, tests_svc_loader, "$Id$");
@@ -47,7 +45,7 @@ int main (int argc, char *argv [])
if (argc < 2)
{
ACE_DEBUG ((LM_DEBUG,
- "Usage: File name to be retrieved%s",
+ "Usage: %s <ior>\n",
argv[0]));
return -1;