Issue 0020194: EDF 977 ALL: Get rid of warnings PACKAGE_VERSION already defined

[modules/smesh.git] / src / OBJECT / Makefile.am

diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am
index 3bc3907c9ce4da80e83fe12df4a98db9dcb0c8e6..30a2e591a560815f81b59e6abba663ba62a7c8ec 100644 (file)
--- a/src/OBJECT/Makefile.am
+++ b/src/OBJECT/Makefile.am
@@ -34,6 +34,7 @@ salomeinclude_HEADERS = \
        SMESH_ActorUtils.h \
        SMESH_ActorDef.h \
        SMESH_DeviceActor.h \
+       SMESH_PreviewActorsCollection.h \
        SMESH_ExtractGeometry.h \
        SMESH_ActorUtils.h \
        SMESH_FaceOrientationFilter.h
@@ -45,11 +46,13 @@ dist_libSMESHObject_la_SOURCES = \
        SMESH_Object.cxx \
        SMESH_DeviceActor.cxx \
        SMESH_Actor.cxx \
+       SMESH_PreviewActorsCollection.cxx \
        SMESH_ExtractGeometry.cxx \
        SMESH_ActorUtils.cxx \
        SMESH_FaceOrientationFilter.cxx
 
 libSMESHObject_la_CPPFLAGS = \
+        $(QT_INCLUDES) \
         $(KERNEL_CXXFLAGS) \
         $(GUI_CXXFLAGS) \
        $(MED_CXXFLAGS) \
@@ -57,6 +60,7 @@ libSMESHObject_la_CPPFLAGS = \
        $(CAS_CPPFLAGS) \
         $(VTK_INCLUDES) \
        $(CORBA_INCLUDES) \
+       $(CORBA_CXXFLAGS) \
         $(BOOST_CPPFLAGS) \
         $(QT_INCLUDES) \
        -I$(srcdir)/../Controls \
@@ -66,13 +70,12 @@ libSMESHObject_la_CPPFLAGS = \
        -I$(srcdir)/../DriverMED \
        -I$(srcdir)/../SMESH \
        -I$(srcdir)/../SMESHClient \
-       -I$(top_builddir)/idl \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libSMESHObject_la_LDFLAGS  = \
         ../SMESHClient/libSMESHClient.la \
         ../SMDS/libSMDS.la \
         ../Controls/libSMESHControls.la \
-        $(GUI_LDFLAGS) -lSalomeApp lSalomeObject \
+        $(GUI_LDFLAGS) -lSalomeApp -lSalomeObject -lSVTK -lVTKViewer -lqtx -lsuit \
        $(CAS_KERNEL) \
-        $(VTK_LIBS)
+        $(VTK_LIBS) $(QT_MT_LIBS)