]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
1) Avoid build_configure warning.
authorvsr <vsr@opencascade.com>
Wed, 24 Oct 2012 15:57:15 +0000 (15:57 +0000)
committervsr <vsr@opencascade.com>
Wed, 24 Oct 2012 15:57:15 +0000 (15:57 +0000)
2) Add missing linkage options

src/TreeData/Test/Makefile.am

index 8d6141e766e8a23ff1295e5b85af8c5f6b568bbb..cf7bf98db171399babab6934a96662057be1952c 100644 (file)
@@ -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