From 6cbce5e2e7ea371bd62f2c91a55c9f35063e5e90 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 4 May 2007 12:50:36 +0000 Subject: [PATCH] Update check Qt procedure for Qt 4.x --- src/Container/Makefile.am | 2 +- src/LifeCycleCORBA/Makefile.am | 4 ++-- src/ModuleCatalog/Makefile.am | 4 ++-- src/ResourcesManager/Makefile.am | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am index c058077fd..b67dd6797 100644 --- a/src/Container/Makefile.am +++ b/src/Container/Makefile.am @@ -64,7 +64,7 @@ COMMON_CPPFLAGS=\ @PYTHON_INCLUDES@ \ @MPI_INCLUDES@ \ @CAS_CPPFLAGS@ @CAS_CXXFLAGS@ \ - @QT_MT_INCLUDES@ \ + @QT_INCLUDES@ \ -I$(srcdir)/../Basics \ -I$(srcdir)/../SALOMELocalTrace \ -I$(srcdir)/../NamingService \ diff --git a/src/LifeCycleCORBA/Makefile.am b/src/LifeCycleCORBA/Makefile.am index 6bee2cf3c..53f89d73d 100644 --- a/src/LifeCycleCORBA/Makefile.am +++ b/src/LifeCycleCORBA/Makefile.am @@ -82,7 +82,7 @@ libSalomeLifeCycleCORBA_la_SOURCES = \ libSalomeLifeCycleCORBA_la_CPPFLAGS = \ $(COMMON_CPPFLAGS) \ @PYTHON_INCLUDES@ \ - @QT_MT_INCLUDES@ \ + @QT_INCLUDES@ \ -I$(srcdir)/../Container \ -I$(srcdir)/../Notification @@ -112,7 +112,7 @@ Test_LifeCycleCORBA_LDADD = \ $(COMMON_LIBS) \ @CORBA_LIBS@ -#CPPFLAGS += $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) +#CPPFLAGS += $(PYTHON_INCLUDES) $(QT_INCLUDES) #LDFLAGS += -lSalomeNS -lOpUtil -lSALOMELocalTrace -lSalomeContainer -lSalomeResourcesManager #LDFLAGSFORBIN= $(LDFLAGS) -lRegistry -lSalomeNotification -lSALOMEBasics diff --git a/src/ModuleCatalog/Makefile.am b/src/ModuleCatalog/Makefile.am index a29139fd2..dcfb7ded6 100644 --- a/src/ModuleCatalog/Makefile.am +++ b/src/ModuleCatalog/Makefile.am @@ -63,7 +63,7 @@ COMMON_CPPFLAGS=\ -I$(top_builddir)/salome_adm/unix \ -I$(top_builddir)/idl \ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ \ - @QT_MT_INCLUDES@ + @QT_INCLUDES@ # This local variable defines the list of dependant libraries common to all target in this package. COMMON_LIBS =\ @@ -86,7 +86,7 @@ libSalomeCatalog_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSalomeCatalog_la_LIBADD =\ $(COMMON_LIBS) \ - @QT_MT_LIBS@ + @QT_LIBS@ # diff --git a/src/ResourcesManager/Makefile.am b/src/ResourcesManager/Makefile.am index eaa49f92a..7770d4272 100755 --- a/src/ResourcesManager/Makefile.am +++ b/src/ResourcesManager/Makefile.am @@ -76,9 +76,9 @@ libSalomeResourcesManager_la_SOURCES =\ libSalomeResourcesManager_la_CPPFLAGS =\ $(COMMON_CPPFLAGS) \ - @QT_MT_INCLUDES@ + @QT_INCLUDES@ libSalomeResourcesManager_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSalomeResourcesManager_la_LIBADD =\ $(COMMON_LIBS) \ - @QT_MT_LIBS@ + @QT_LIBS@ -- 2.39.2