diff options
Diffstat (limited to 'TAO/tests/Bug_1639_Regression/Makefile.Bug_1639_testclient')
| -rw-r--r-- | TAO/tests/Bug_1639_Regression/Makefile.Bug_1639_testclient | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/TAO/tests/Bug_1639_Regression/Makefile.Bug_1639_testclient b/TAO/tests/Bug_1639_Regression/Makefile.Bug_1639_testclient index 7acd995a1d0..8c8c189a5c7 100644 --- a/TAO/tests/Bug_1639_Regression/Makefile.Bug_1639_testclient +++ b/TAO/tests/Bug_1639_Regression/Makefile.Bug_1639_testclient @@ -32,7 +32,7 @@ FILES = \ #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- -LDLIBS = -lTAO_PortableServer -lTAO_DynamicAny -lTAO -lACE +LDLIBS = -lTAO_DynamicAny -lTAO_PortableServer -lTAO_IORInterceptor -lTAO_ObjRefTemplate -lTAO_Valuetype -lTAO -lACE include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU ## We don't need the ACELIB setting from wrapper_macros.GNU ACELIB = @@ -75,7 +75,7 @@ all: idl_stubs # This rule forces make to run the idl_stubs # target before building any of the source files. -struct_client.cpp structC.cpp structS.cpp: idl_stubs +FORCED_IDL_STUBS = struct_client.cpp structC.cpp structS.cpp endif include $(ACE_ROOT)/include/makeinclude/macros.GNU @@ -88,14 +88,14 @@ include $(TAO_ROOT)/taoconfig.mk CPPFLAGS += -I../../../include -I. -I../.. -I../../tao -I../../.. ifeq ($(static_libs),1) ifneq ($(LIB),) - CPPFLAGS += -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS + CPPFLAGS += -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS endif endif -LDFLAGS += -L../../../ace -L. -L../../tao/PortableServer -L../../tao/DynamicAny -L../../tao -L../../../lib +LDFLAGS += -L../../../lib -TAO_IDLFLAGS += -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h +TAO_IDLFLAGS += -Gv -I../.. -I../../tao -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- @@ -104,13 +104,16 @@ require_warning: @echo exceptions -ADDITIONAL_IDL_TARGETS = # IDL File Directory: . ifneq ($(ADDITIONAL_IDL_TARGETS),) idl_stubs: $(ADDITIONAL_IDL_TARGETS) endif +ifneq ($(FORCED_IDL_STUBS),) +$(FORCED_IDL_STUBS): idl_stubs +endif + .PRECIOUS: $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext))) ifndef kylix |