From: vsr <vsr@opencascade.com>
Date: Mon, 20 Jun 2005 04:43:45 +0000 (+0000)
Subject: Add support for sip 4.2
X-Git-Tag: T3_0_0_a4~74
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e6eee050d68cbb3f39f7010c3a68cd29a8e60f5c;p=modules%2Fgui.git

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 a8d05679b..1c5fb3798 100644
--- 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 6899f984b..5f3ffb6f2 100644
--- 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