Add support for sip 4.2

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
index a8d05679bf5e789d1a86aad5ce09c9b21f2e4fdc..1c5fb3798c4a89fff9dd85078a470e9c1d8582d9 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
@@ -27,13 +27,18 @@ endif
 SIP_FLAGS = -t WS_X11 -t $(QT_VERS) -s ".cc" -c . -I $(PYQT_SIPS)
 
 # Sip sources
-ifeq ($(SIP_VERS),v4)
+ifeq ($(SIP_VERS),v4_old)
+SIP_SRC   = sipSalomePyQtGUIcmodule.cc
+SIP_FILES = SALOME_PYQT_GUI.sip
+else
+ifeq ($(SIP_VERS),v4_new)
 SIP_SRC   = sipSalomePyQtGUIcmodule.cc
 SIP_FILES = SALOME_PYQT_GUI.sip
 else
 SIP_SRC   = SalomePyQtGUIcmodule.cc
 SIP_FILES = SALOME_PYQT_GUI.sip
 endif
+endif
 
 ######################
 

diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.in b/src/SALOME_PYQT/SalomePyQt/Makefile.in
index 6899f984b29b29ebae58c3c4f8584bdbddb70ee4..5f3ffb6f2d1d37d3bd19762173279dc1a647fff2 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/Makefile.in
+++ b/src/SALOME_PYQT/SalomePyQt/Makefile.in
@@ -30,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 
@@ -45,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