X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOME_PYQT%2FSalomePyQt%2FMakefile.in;h=b1be9c4a1a3f2563455a39f7405fc2f1166df666;hb=0e6b3ef503c54ff17d20ca997eec23e75eda8b87;hp=300a7b509ad81a6f44e7b449afc03f5a103d0777;hpb=ec1dbae010fc6104d7fefb3731628a89a8e79cdb;p=modules%2Fgui.git

diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.in b/src/SALOME_PYQT/SalomePyQt/Makefile.in
index 300a7b509..b1be9c4a1 100644
--- a/src/SALOME_PYQT/SalomePyQt/Makefile.in
+++ b/src/SALOME_PYQT/SalomePyQt/Makefile.in
@@ -19,6 +19,9 @@ VPATH=.:@srcdir@:@top_srcdir@/idl
 ifeq ($(QT_VERS),Qt_3_3_3)
 QT_VERS = Qt_3_3_0
 endif
+ifeq ($(QT_VERS),Qt_3_3_4)
+QT_VERS = Qt_3_3_0
+endif
 
 # Sip flags
 SIP_FLAGS = -t WS_X11 -t $(QT_VERS) -s ".cc" -c . -I $(PYQT_SIPS)
@@ -27,14 +30,18 @@ SIP_SRC = sipSalomePyQtSalomePyQt.cc \
 	  sipSalomePyQtSALOME_Selection.cc
 
 # Sip version-specific sources
-ifeq ($(SIP_VERS),v4)
+ifeq ($(SIP_VERS),v4_old)
+SIP_SRC  += sipSalomePyQtcmodule.cc
+else
+ifeq ($(SIP_VERS),v4_new)
 SIP_SRC  += sipSalomePyQtcmodule.cc
 else
 SIP_SRC  += SalomePyQtcmodule.cc
 endif
+endif
 
 # Sip/moc sources
-ifeq ($(SIP_VERS),v4)
+ifeq ($(SIP_VERS),v4_old)
 MOC_SRC   = sipSalomePyQtcmodule_moc.cxx
 MOC_H     = sipSalomePyQtcmodule.h
 else 
@@ -42,28 +49,42 @@ ifeq ($(SIP_VERS),v3_new)
 MOC_SRC   = SalomePyQtcmodule_moc.cxx
 MOC_H     = SalomePyQtcmodule.h
 else
+ifeq ($(SIP_VERS),v3_old)
 MOC_SRC   = sipSalomePyQtProxySalomePyQt_moc.cxx
 MOC_H     = sipSalomePyQtProxySalomePyQt.h
 endif
 endif
+endif
 
 # Sip definition files
-ifeq ($(SIP_VERS),v4)
+ifeq ($(SIP_VERS),v4_old)
+SIP_FILES = SalomePyQt_v4.sip
+else
+ifeq ($(SIP_VERS),v4_new)
 SIP_FILES = SalomePyQt_v4.sip
 else
 SIP_FILES = SalomePyQt.sip
 endif 
+endif 
 
 # Libraries targets
-ifeq ($(SIP_VERS),v4)
+ifeq ($(SIP_VERS),v4_old)
+LIB = SalomePyQt.so
+else
+ifeq ($(SIP_VERS),v4_new)
 LIB = SalomePyQt.so
 else
 LIB = libSalomePyQtcmodule.la
 endif 
+endif 
 
 # Exported python scripts
-ifneq ($(SIP_VERS),v4)
+ifeq ($(SIP_VERS),v3_old)
 EXPORT_SHAREDPYSCRIPTS = SalomePyQt.py
+else
+ifeq ($(SIP_VERS),v3_new)
+EXPORT_SHAREDPYSCRIPTS = SalomePyQt.py
+endif
 endif
 
 # Library sources
@@ -80,7 +101,7 @@ LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl
 # Compilation/linkage flags
 CPPFLAGS += $(QT_INCLUDES) $(PYTHON_INCLUDES) $(SIP_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H -I${KERNEL_ROOT_DIR}/include/salome
 LIBS     += $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) $(OGL_LIBS)
-LDFLAGS  += -lsuit -lCAM -lstd -lqtx -lSalomeApp -lSalomeSession -lEvent -lLogWindow -lVTKViewer -lToolsGUI -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeDS
+LDFLAGS  += -lsuit -lCAM -lstd -lqtx -lSalomeApp -lSalomeSession -lEvent -lLogWindow -lVTKViewer -lToolsGUI -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeDS -lSalomePyQtGUI
 
 
 # Custom build step: generate C++ wrapping according to $(SIP_FILES)