From ecc6c971059cf9f837f67fcfd3a7a12241fff913 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 24 Oct 2012 15:57:15 +0000 Subject: [PATCH] 1) Avoid build_configure warning. 2) Add missing linkage options --- src/TreeData/Test/Makefile.am | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/TreeData/Test/Makefile.am b/src/TreeData/Test/Makefile.am index 8d6141e76..cf7bf98db 100644 --- a/src/TreeData/Test/Makefile.am +++ b/src/TreeData/Test/Makefile.am @@ -39,7 +39,7 @@ CORBA_CXXFLAGS=@OMNIORB_CXXFLAGS@ @OMNIORB_INCLUDES@ CORBA_LIBS=@OMNIORB_LIBS@ QT_CXXFLAGS=@QT_INCLUDES@ @QT_MT_INCLUDES@ -TEST_CPPFLAGS = \ +COMMON_CPP_FLAGS = \ $(QT_CXXFLAGS) \ $(CORBA_CXXFLAGS) \ $(KERNEL_CXXFLAGS) \ @@ -47,11 +47,16 @@ TEST_CPPFLAGS = \ -I$(top_srcdir)/src/TreeData \ -I. -TEST_LDFLAGS = \ +COMMON_LIBS = \ $(CORBA_LIBS) $(QT_LIBS) \ $(top_builddir)/src/TreeData/libSalomeTreeData.la \ $(top_builddir)/src/GuiHelpers/libSalomeGuiHelpers.la \ - $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeKernelHelpers + $(top_builddir)/src/SUIT/libsuit.la \ + $(top_builddir)/src/CAM/libCAM.la \ + $(top_builddir)/src/Plot2d/libPlot2d.la \ + $(top_builddir)/src/LightApp/libLightApp.la \ + $(top_builddir)/src/SalomeApp/libSalomeApp.la \ + $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeKernelHelpers @LIBXML_LIBS@ # Program targets bin_PROGRAMS = TreeData_guitester TreeData_tester @@ -76,20 +81,20 @@ TreeData_guitester_SOURCES = \ MyDataModel.cxx TreeData_guitester_CPPFLAGS = \ - $(TEST_CPPFLAGS) + $(COMMON_CPP_FLAGS) TreeData_guitester_LDFLAGS = \ - $(TEST_LDFLAGS) + $(COMMON_LIBS) TreeData_tester_SOURCES = \ tester.cxx \ MyDataModel.cxx TreeData_tester_CPPFLAGS = \ - $(TEST_CPPFLAGS) + $(COMMON_CPP_FLAGS) TreeData_tester_LDFLAGS = \ - $(TEST_LDFLAGS) + $(COMMON_LIBS) # test data files testdir = $(salomeresdir)/testdata -- 2.39.2