summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile')
-rw-r--r--TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
index c25b22626e2..d521fdcbb2c 100644
--- a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
@@ -6,7 +6,7 @@
shared_libs_only=1
MAKEFILE = Makefile
LIBNAME = libavdemo
-SHLIB2 = $(LIBNAME).$(SOEXT)
+SHLIB = $(LIBNAME).$(SOEXT)
IDL_SRCS= Video_Repository
@@ -35,8 +35,6 @@ VLDLIBS = $(LDLIBS:%=%$(VAR))
CPPFLAGS += -I$(JAVA_ROOT)/include-old -I$(JAVA_ROOT)/include-old/solaris \
-I$(TAO_ROOT)/orbsvcs -I$(MPEG_ROOT) -I$(TAO_ROOT) $(TSS_ORB_FLAG) -I$(TAO_ROOT)/orbsvcs/orbsvcs
-BIN2 = main
-
#----------------------------------------------------------------------------
# Include macros and targets
#----------------------------------------------------------------------------
@@ -48,8 +46,7 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
BUILD := TAO_VR.module $(BUILD)
- BIN = $(BIN2)
- SHLIB = $(SHLIB2)
+ BIN = main
else # ! AV
BUILD =
override INSTALL =
@@ -77,8 +74,11 @@ TAO_VR.module: Video_Repository.idl
$(JAVA_ROOT)/bin/idltojava Video_Repository.idl
touch TAO_VR.module
+clean:
+ -/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
+
realclean: clean
- -$(RM) Video_Repository.idl $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES)) \
+ -/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES)) \
$(addsuffix _T.h, $(IDL_FILES)) $(addsuffix _T.i, $(IDL_FILES)) $(addsuffix _T.cpp, $(IDL_FILES))
IDL_EXT=C.h C.i C.cpp S.h S.i S.cpp S_T.h S_T.i S_T.cpp