diff options
Diffstat (limited to 'TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.mif_client')
| -rw-r--r-- | TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.mif_client | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.mif_client b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.mif_client index 1921a91a7ee..8d35cbdd4f2 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.mif_client +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.mif_client @@ -11,7 +11,7 @@ #---------------------------------------------------------------------------- MAKEFILE = Makefile.mif_client DEPENDENCY_FILE = .depend.Makefile.mif_client -BIN_UNCHECKED = mif_client +BIN_UNCHECKED = client ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO @@ -20,7 +20,7 @@ ifndef CIAO_ROOT CIAO_ROOT = $(TAO_ROOT)/CIAO endif -TAO_IDL = $(ACE_ROOT)/bin/tao_idl +TAO_IDL = ../../../../bin/tao_idl IDL_FILES = test IDL_SRC = $(foreach ext, C.cpp S.cpp, $(foreach file, $(IDL_FILES), $(file)$(ext))) @@ -31,7 +31,7 @@ FILES = \ #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- -LDLIBS = -lKokyu_DSRT_Schedulers -lKokyu -lTAO_RTCORBA -lTAO -lACE +LDLIBS = -lTAO_RTScheduler -lKokyu -lKokyu_DSRT_Schedulers -lTAO_RTCORBA -lTAO -lACE include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU ## We don't need the ACELIB setting from wrapper_macros.GNU ACELIB = @@ -50,20 +50,13 @@ $(TEMPINCDIR): endif -ifeq ($(rt_corba),1) BIN = $(BIN_UNCHECKED) -else - all: require_warning -endif OBJS = $(addsuffix .o, $(notdir $(FILES))) SRC = $(addsuffix .cpp, $(FILES)) ifneq ($(BIN),) all: idl_stubs - -# This rule forces make to run the idl_stubs -# target before building any of the source files. testC.cpp client.cpp: idl_stubs endif @@ -74,26 +67,22 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU include $(TAO_ROOT)/taoconfig.mk -CPPFLAGS += -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers -I$(ACE_ROOT)/Kokyu -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(ACE_ROOT) +CPPFLAGS += -I../../../tao/RTScheduling -I../../../tao/RTCORBA -I../../../../Kokyu -I../../../examples/Kokyu_dsrt_schedulers -I../../.. -I../../../tao -I../../../.. ifeq ($(static_libs),1) ifneq ($(LIB),) - CPPFLAGS += -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS + CPPFLAGS += -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS endif endif -LDFLAGS += -L$(ACE_ROOT)/lib +LDFLAGS += -L../../../examples/Kokyu_dsrt_schedulers -L../../../tao/RTScheduling -L../../../tao/RTCORBA -L../../../../Kokyu -L../../../tao -L../../../../ace -L../../../../lib TAO_IDLFLAGS += -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- -require_warning: - @echo This project will not be built due to one of the following missing features: - @echo rt_corba - -$(ACE_ROOT)/lib: - -@mkdir -p "$(ACE_ROOT)/lib" +.: + -@mkdir -p "." ADDITIONAL_IDL_TARGETS = @@ -105,13 +94,8 @@ endif .PRECIOUS: $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext))) -ifndef kylix $(BIN): $(addprefix $(VDIR), $(OBJS)) $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK) -else -$(BIN): $(addprefix $(VDIR), $(OBJS)) - $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $(VLDLIBS) $(BORINITEXEOBJ) $(POSTLINK) $^, $@,, -endif realclean: clean -$(RM) $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext))) |