From 3c5b7bc23889a97b3aa513af009fd4e2472f9f16 Mon Sep 17 00:00:00 2001 From: yoogx Date: Thu, 9 Jul 2015 15:33:38 +0200 Subject: [PATCH] * Solve link issue with PolyORB-HI/C C++ files --- share/make/Makefile.common.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/make/Makefile.common.in b/share/make/Makefile.common.in index 2693d4b..c3e317e 100644 --- a/share/make/Makefile.common.in +++ b/share/make/Makefile.common.in @@ -202,7 +202,7 @@ check-linuxtaste: ################################################################################ # TASTE-RUNTIME-MONITORING -ifeq ($(MONITORING),true) +ifeq ($(MONITORING), true) MONITORING_OBJS = trace_manager.o remote_configuration.o PO_HI_CPPOBJS += $(MONITORING_OBJS) @@ -327,7 +327,7 @@ ifeq ($(TARGET), $(filter $(TARGET), native bench linux32 linux64)) EXE=$(BINARY) $(BINARY): $(MAKE) generate-asn1-deployment target-objects compile-c-files compile-cpp-files compile-ada-files compile-po-hi $(USER_OBJS) $(GENERATED_OBJS) $(TARGET_OBJECTS) - $(LD) -o $(EXE) $(EXTERNAL_OBJECTS) $(PO_HI_OBJS) $(GENERATED_OBJS) $(USER_OBJS) $(LDFLAGS) + $(LD) -o $(EXE) $(EXTERNAL_OBJECTS) $(PO_HI_OBJS) $(PO_HI_CPPOBJS) $(GENERATED_OBJS) $(USER_OBJS) $(LDFLAGS) endif ifeq ($(TARGET), $(filter $(TARGET), win32)) -- GitLab