PRO files reorganized

diff --git a/src/CAF/CAF.pro b/src/CAF/CAF.pro
index 9bd5d3490f0b305c306e0febee1f496bfad68d5a..50e2c29afcdba2dfecf09d3fe6d21adef89327a5 100644 (file)
--- a/src/CAF/CAF.pro
+++ b/src/CAF/CAF.pro
@@ -1,9 +1,7 @@
 unix:TEMPLATE = lib
 win32:TEMPLATE = vclib
 
-DESTDIR = ../../$(CONFIG_ID)/lib
-MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
+include(../Common.pro)
 
 CAS_CPPFLAGS = $(CASINC)
 
@@ -11,42 +9,12 @@ CAS_KERNEL = -L$(CASLIB) -lTKernel
 
 CAS_VIEWER = -L$(CASLIB) -lTKV3d -lTKService
 
-INCLUDEPATH += ../../include $${CAS_CPPFLAGS}
-LIBS += -L../../$(CONFIG_ID)/lib $${CAS_KERNEL} $${CAS_VIEWER} -lQtx -lSUIT -lSTD
-
-CONFIG -= debug release debug_and_release
-CONFIG += qt thread debug dll shared
+INCLUDEPATH += $${CAS_CPPFLAGS}
+LIBS += $${CAS_KERNEL} $${CAS_VIEWER} -lQtx -lSUIT -lSTD
 
 win32:DEFINES += WIN32
 DEFINES += $(CASDEFINES) CAF_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
 
-HEADERS  = *.h
-
-SOURCES  = *.cxx
-
-TRANSLATIONS = resources/CAF_images.ts \
-               resources/CAF_msg_en.ts
-
-unix:GUIResources = ../../resources
-win32:GUIResources = ..\\..\\resources
-
-lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_IN} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.input = TRANSLATIONS
-unix:lrelease.clean = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.CONFIG += no_link target_predeps
-QMAKE_EXTRA_COMPILERS += lrelease
-
-ICONS   = resources/*.png
-
-includes.files = $$HEADERS
-includes.path = ../../include
-
-resources.files = $$ICONS resources/*.xml resources/*.ini
-resources.path = ../../resources
+include(../Translations.pro)
+include(../Resources.pro)
 
-INSTALLS += includes resources

diff --git a/src/Common.pro b/src/Common.pro
index 444506608a6907bad0381c561ebe36dee93dd357..904f305f4aa33cf13ecddc0a61160868a515bf9c 100644 (file)
--- a/src/Common.pro
+++ b/src/Common.pro
@@ -8,3 +8,58 @@ contains( CONFIG_MODE, debug ) {
   CONFIG += release
 }
 
+win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
+
+isEmpty( HEADERS ):HEADERS = *.h
+isEmpty( SOURCES ):SOURCES = *.cxx
+
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../$$(CONFIG_ID)/$$(CONFIG_MODE)/obj/$$TARGET
+
+unix {
+  contains( TEMPLATE, lib ) {
+    DESTDIR = ../../$(CONFIG_ID)/lib
+  } else {
+    DESTDIR = ../../$(CONFIG_ID)/bin
+  }
+
+  INCLUDEPATH += ../../include
+  LIBS += -L../../$(CONFIG_ID)/lib
+
+  GUIResources = ../../resources
+
+  includes.files = $$HEADERS
+  includes.path = ../../include
+
+  INSTALLS += includes
+}
+
+win32 {
+  contains( TEMPLATE, vclib ) {
+    DESTDIR = $$(SUIT_DIR)/$$(CONFIG_ID)/lib/$$(CONFIG_MODE)
+  } else {
+    DESTDIR = $$(SUIT_DIR)/$$(CONFIG_ID)/bin/$$(CONFIG_MODE)
+  }
+
+  HEADERS_DIR = $$(SUIT_DIR)/$$(CONFIG_ID)/include
+  INCLUDEPATH += $${HEADERS_DIR}
+  LIBS += -L$$(SUIT_DIR)/$$(CONFIG_ID)/lib/$$(CONFIG_MODE)
+
+  copy_hdr.name = Install ${QMAKE_FILE_IN}
+  copy_hdr.commands = type ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+  copy_hdr.output = $${HEADERS_DIR}/${QMAKE_FILE_NAME}
+  copy_hdr.input = HEADERS
+  QMAKE_EXTRA_COMPILERS += copy_hdr
+
+  GUIResources = $$(SUIT_DIR)\\$$(CONFIG_ID)\\resources
+}
+
+
+
+# On Win32, disable optimization and generate debug info in release mode
+win32 {
+  QMAKE_CXXFLAGS_RELEASE *= /Od /Zi
+  QMAKE_LFLAGS_RELEASE *= /DEBUG 
+}
+
+

diff --git a/src/Event/Event.pro b/src/Event/Event.pro
index c598cdad1395e933eabfa337284c3f98240d3805..9acb6ee3d30e5f24d3d69937be1640ba0608a7c3 100644 (file)
--- a/src/Event/Event.pro
+++ b/src/Event/Event.pro
@@ -1,24 +1,12 @@
-TEMPLATE = lib\r
-TARGET = Event\r
-\r
-include(../Common.pro)\r
-\r
-DESTDIR = ../../$(CONFIG_ID)/lib\r
-MOC_DIR = ../../moc\r
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET\r
-\r
-INCLUDEPATH += ../../include\r
-LIBS += \r
-\r
-win32:DEFINES += WIN32 \r
-DEFINES += EVENT_EXPORTS\r
-\r
-HEADERS  = Event.h\r
-HEADERS += SALOME_Event.h\r
-\r
-SOURCES  = SALOME_Event.cxx\r
-\r
-includes.files = $$HEADERS\r
-includes.path = ../../include\r
-\r
-INSTALLS += includes\r
+unix:TEMPLATE = lib
+win32:TEMPLATE = vclib
+TARGET = Event
+
+include(../Common.pro)
+
+win32:LIBS *= -L$(QTLIB)
+win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui
+
+win32:DEFINES += WNT WIN32
+
+DEFINES += EVENT_EXPORTS

diff --git a/src/HTMLService/HTMLService.pro b/src/HTMLService/HTMLService.pro
index 4e6e0a98b09a39d3f7cdedcb0251b98c8fe51ed7..694433f9a7bc1d0fafa82b754a6ce3a52aa9b4f3 100755 (executable)
--- a/src/HTMLService/HTMLService.pro
+++ b/src/HTMLService/HTMLService.pro
@@ -1,37 +1,19 @@
 unix:TEMPLATE = lib
 win32:TEMPLATE = vclib
 
+HEADERS = *.hxx
 include(../Common.pro)
 
-DESTDIR = ../../$(CONFIG_ID)/lib
-MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
-
 CAS_CPPFLAGS = $(CASINC)
 
 CAS_KERNEL = -L$(CASLIB) -lTKernel
 
 CAS_VIEWER = -L$(CASLIB) -lTKV3d -lTKService
 
-INCLUDEPATH += ../../include  $${CAS_CPPFLAGS}
-LIBS += -L../../$(CONFIG_ID)/lib $${CAS_KERNEL} $${CAS_VIEWER}
+INCLUDEPATH += $${CAS_CPPFLAGS}
+LIBS += $${CAS_KERNEL} $${CAS_VIEWER}
 win32:LIBS *= -L$(QTLIB)
 win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
-win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
-win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.hxx
-win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.hxx
-win32:copy_hdr.input = HEADERS
-win32:QMAKE_EXTRA_COMPILERS += copy_hdr
-
 win32:DEFINES += WNT WIN32 
 DEFINES += HTMLSERVICE_EXPORTS $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
-
-HEADERS  = *.hxx
-
-SOURCES  = *.cxx
-
-includes.files = $$HEADERS
-includes.path = ../../include
-
-INSTALLS += includes

diff --git a/src/LogWindow/LogWindow.pro b/src/LogWindow/LogWindow.pro
index 23867fe156da1e2a119388a411f6434417c161ba..91f117b718f6a1002b58bea397d328eec4a03f7d 100644 (file)
--- a/src/LogWindow/LogWindow.pro
+++ b/src/LogWindow/LogWindow.pro
@@ -3,47 +3,11 @@ win32:TEMPLATE = vclib
 
 include(../Common.pro)
 
-win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
-
-DESTDIR = ../../$(CONFIG_ID)/lib
-MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
-
-INCLUDEPATH = ../../include
-LIBS += -L../../$(CONFIG_ID)/lib -lSUIT -lQtx
+LIBS += -lSUIT -lQtx
 win32:LIBS *= -L$(QTLIB)
 win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 win32:DEFINES += WNT WIN32
 DEFINES += LOGWINDOW_EXPORTS
 
-HEADERS = *.h
-
-SOURCES = *.cxx
-
-TRANSLATIONS = resources/LogWindow_msg_en.ts
-
-unix:GUIResources = ../../resources
-win32:GUIResources = ..\\..\\resources
-
-lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_IN} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.input = TRANSLATIONS
-unix:lrelease.clean = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.CONFIG += no_link target_predeps
-QMAKE_EXTRA_COMPILERS += lrelease
-
-win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
-win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.input = HEADERS
-win32:QMAKE_EXTRA_COMPILERS += copy_hdr
-
-includes.files = $$HEADERS
-includes.path = ../../include
-
-INSTALLS += includes
+include(../Translations.pro)

diff --git a/src/OBJECT/OBJECT.pro b/src/OBJECT/OBJECT.pro
index 8839a194fe7d2798ac4eb1c56e2ef45f8732c688..a5b7952b62f267f873f9d29275404ef6c036989b 100644 (file)
--- a/src/OBJECT/OBJECT.pro
+++ b/src/OBJECT/OBJECT.pro
@@ -1,20 +1,16 @@
 unix:TEMPLATE = lib
 win32:TEMPLATE = vclib
 
-include(../Common.pro)
-
-win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
+HEADERS = *.hxx *.ixx *.jxx
 
-DESTDIR = ../../$(CONFIG_ID)/lib
-MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
+include(../Common.pro)
 
 CAS_CPPFLAGS = $(CASINC)
 
 unix:CAS_LDPATH = -L$(CASLIB) -lTKV3d
 win32:CAS_LDPATH = -L$(CASLIB) -lTKernel -lTKMath -lTKV3d
 
-INCLUDEPATH += ../../include $${CAS_CPPFLAGS}
+INCLUDEPATH += $${CAS_CPPFLAGS}
 LIBS += $${CAS_LDPATH}
 win32:LIBS *= -L$(QTLIB)
 win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
@@ -22,21 +18,3 @@ win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 win32:DEFINES += WNT WIN32 
 DEFINES += $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
 
-HEADERS  = *.hxx
-HEADERS += *.h
-HEADERS += *.ixx
-HEADERS += *.jxx
-
-SOURCES  = *.cxx
-
-win32:COPY_FILES = *.hxx *.h
-win32:copy_hxx.name = Install(.hxx) ${QMAKE_FILE_IN}
-win32:copy_hxx.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.hxx
-win32:copy_hxx.output = ../../include/${QMAKE_FILE_BASE}.hxx
-win32:copy_hxx.input = COPY_FILES
-win32:QMAKE_EXTRA_COMPILERS += copy_hxx
-
-includes.files = $$HEADERS
-includes.path = ../../include
-
-INSTALLS += includes

diff --git a/src/ObjBrowser/ObjBrowser.pro b/src/ObjBrowser/ObjBrowser.pro
index 7dca05c4d6b0bff8f9698661f4db1343f9afc407..eab357f397733769c6790e66731b9bcb7f968271 100644 (file)
--- a/src/ObjBrowser/ObjBrowser.pro
+++ b/src/ObjBrowser/ObjBrowser.pro
@@ -3,48 +3,13 @@ win32:TEMPLATE = vclib
 
 include(../Common.pro)
 
-win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
-
-DESTDIR = ../../$(CONFIG_ID)/lib
-MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
-
-INCLUDEPATH += ../../include ../Qtx
-LIBS += -L../../$(CONFIG_ID)/lib -lQtx
+INCLUDEPATH += ../Qtx
+LIBS += -lQtx
 win32:LIBS *= -L$(QTLIB)
 win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 win32:DEFINES += WNT WIN32
 DEFINES += OB_EXPORTS
 
-HEADERS = *.h
-
-SOURCES = *.cxx
-
-TRANSLATIONS = resources/OB_msg_en.ts
-
-unix:GUIResources = ../../resources
-win32:GUIResources = ..\\..\\resources
-
-lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_IN} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.input = TRANSLATIONS
-unix:lrelease.clean = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.CONFIG += no_link target_predeps
-QMAKE_EXTRA_COMPILERS += lrelease
-
-win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
-win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.input = HEADERS
-win32:QMAKE_EXTRA_COMPILERS += copy_hdr
-
-
-includes.files = $$HEADERS
-includes.path = ../../include
+include(../Translations.pro)
 
-INSTALLS += includes

diff --git a/src/Plot2d/Plot2d.pro b/src/Plot2d/Plot2d.pro
index 531f76994ef639347022beff5759a08be4fc94e2..f74f2fdf0c97aa63c8c4916b06c03f86b201270e 100644 (file)
--- a/src/Plot2d/Plot2d.pro
+++ b/src/Plot2d/Plot2d.pro
@@ -3,64 +3,16 @@ win32:TEMPLATE = vclib
 
 include(../Common.pro)
 
-win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
-
-DESTDIR = ../../$(CONFIG_ID)/lib
-MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
-
-INCLUDEPATH += ../../include $$(QWTINC) $$(PYTHONINC)
+INCLUDEPATH += $$(QWTINC) $$(PYTHONINC)
 INCLUDEPATH += ../Qtx ../SUIT
 unix:LIBS  += -L$$(QWTLIB) -lqwt
 win32:LIBS += /LIBPATH:$$(QWTLIB) -lqwt5
-LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT
+LIBS += -lQtx -lSUIT
 win32:LIBS *= -L$(QTLIB)
 win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 win32:DEFINES += WNT WIN32 QWT_DLL
 DEFINES += PLOT2D_EXPORTS
 
-HEADERS  = *.h
-
-SOURCES  = *.cxx
-
-TRANSLATIONS = resources/Plot2d_msg_en.ts \
-               resources/Plot2d_images.ts
-
-unix:GUIResources = ../../resources
-win32:GUIResources = ..\\..\\resources
-
-win32:copy_hdr.name = Install headers ${QMAKE_FILE_IN}
-win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.input = HEADERS
-win32:QMAKE_EXTRA_COMPILERS += copy_hdr
-
-lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm ${QMAKE_FILE_OUT}
-win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
-unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.input = TRANSLATIONS
-unix:lrelease.clean = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.CONFIG += no_link target_predeps
-QMAKE_EXTRA_COMPILERS += lrelease
-
-ICONS = resources/*.png
-
-win32:SOURCES+=$$ICONS
-win32:Resource=$$ICONS
-win32:copy_res.name = Install resources ${QMAKE_FILE_IN}
-win32:copy_res.commands = type ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-win32:copy_res.output = $${GUIResources}\\${QMAKE_FILE_BASE}.png
-win32:copy_res.input = Resource
-win32:QMAKE_EXTRA_COMPILERS += copy_res
-
-includes.files = $$HEADERS
-includes.path = ../../include
-
-resources.files = $$ICONS
-resources.path = ../../resources
-
-INSTALLS += includes resources
+include(../Translations.pro)
+include(../Resources.pro)
\ No newline at end of file

diff --git a/src/Prs/Prs.pro b/src/Prs/Prs.pro
index 6a7777b9c397e03bea7aba7f9658f186b363fe8d..5cfb683f496bc15e254b977ed2b6463e00ad8cbe 100644 (file)
--- a/src/Prs/Prs.pro
+++ b/src/Prs/Prs.pro
@@ -3,29 +3,8 @@ win32:TEMPLATE = vclib
 
 include(../Common.pro)
 
-win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
-
-DESTDIR = ../../$(CONFIG_ID)/lib
-MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
-
 win32:LIBS *= -L$(QTLIB)
 win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 win32:DEFINES += WNT WIN32
 DEFINES += PRS_EXPORTS
-
-HEADERS  = *.h
-
-SOURCES  = *.cxx
-
-win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
-win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.input = HEADERS
-win32:QMAKE_EXTRA_COMPILERS += copy_hdr
-
-includes.files = $$HEADERS
-includes.path = ../../include
-
-INSTALLS += includes

diff --git a/src/PyConsole/PyConsole.pro b/src/PyConsole/PyConsole.pro
index d77cffe0062801c96bd1f67ccd2351818e0d4d6c..7ad871851c1fcf071e70a6111e0959ac5e867701 100644 (file)
--- a/src/PyConsole/PyConsole.pro
+++ b/src/PyConsole/PyConsole.pro
@@ -3,15 +3,9 @@ win32:TEMPLATE = vclib
 
 include(../Common.pro)
 
-win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
-
-DESTDIR = ../../$(CONFIG_ID)/lib
-MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
-
-INCLUDEPATH += ../../include $$(PYTHONINC)
-unix:LIBS  += -L../../$(CONFIG_ID)/lib -L$$(PYTHONLIB) -lpython2.5 -lSUIT -lPyInterp
-win32:LIBS  += -L../../$(CONFIG_ID)/lib -L$$(PYTHONLIB) -lSUIT -lPyInterp -lQtx
+INCLUDEPATH += $$(PYTHONINC)
+unix:LIBS  += -L$$(PYTHONLIB) -lpython2.5 -lSUIT -lPyInterp
+win32:LIBS  += -L$$(PYTHONLIB) -lSUIT -lPyInterp -lQtx
 win32:CONFIG_MODE= $$(CONFIG_MODE)
 contains( CONFIG_MODE, debug ) {
   win32:LIBS += -lpython25_d
@@ -25,33 +19,4 @@ win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 win32:DEFINES += WNT WIN32 HAVE_DEBUG_PYTHON
 DEFINES += PYCONSOLE_EXPORTS
 
-HEADERS = *.h
-
-SOURCES = *.cxx
-
-TRANSLATIONS = resources/PyConsole_msg_en.ts
-
-unix:GUIResources = ../../resources
-win32:GUIResources = ..\\..\\resources
-
-lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_IN} ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.input = TRANSLATIONS
-unix:lrelease.clean = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.CONFIG += no_link target_predeps
-QMAKE_EXTRA_COMPILERS += lrelease
-
-win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
-win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.input = HEADERS
-win32:QMAKE_EXTRA_COMPILERS += copy_hdr
-
-includes.files = $$HEADERS
-includes.path = ../../include
-
-INSTALLS += includes
+include(../Translations.pro)

diff --git a/src/PyInterp/PyInterp.pro b/src/PyInterp/PyInterp.pro
index ba5bce50a596f2d46c6eb22f480f26774681b742..5ae903fa602c39c5246447f4643c2b55959df253 100644 (file)
--- a/src/PyInterp/PyInterp.pro
+++ b/src/PyInterp/PyInterp.pro
@@ -3,15 +3,9 @@ win32:TEMPLATE = vclib
 
 include(../Common.pro)
 
-win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
-
-DESTDIR = ../../$(CONFIG_ID)/lib
-MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
-
-INCLUDEPATH += ../../include $$(PYTHONINC)
-unix:LIBS  += -L$$(PYTHONLIB) -lpython2.5 -L../../$(CONFIG_ID)/lib -lEvent
-win32:LIBS += -L$$(PYTHONLIB)
+INCLUDEPATH += $$(PYTHONINC)
+unix:LIBS  += -lEvent -L$$(PYTHONLIB) -lpython2.5 
+win32:LIBS += -lEvent -L$$(PYTHONLIB)
 win32:CONFIG_MODE= $$(CONFIG_MODE)
 contains( CONFIG_MODE, debug ) {
   win32:LIBS += -lpython25_d
@@ -23,18 +17,3 @@ win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 win32:DEFINES += WNT WIN32 HAVE_DEBUG_PYTHON
 DEFINES += PYINTERP_EXPORTS
-
-HEADERS = *.h
-
-SOURCES = *.cxx
-
-win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
-win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.input = HEADERS
-win32:QMAKE_EXTRA_COMPILERS += copy_hdr
-
-includes.files = $$HEADERS
-includes.path = ../../include
-
-INSTALLS += includes

diff --git a/src/Qtx/Qtx.pro b/src/Qtx/Qtx.pro
index 723aa23dbcfe6435b04056599e95146fc78dce5a..1a3a451db5ec524acfee431619ab78ef6c81c5d0 100644 (file)
--- a/src/Qtx/Qtx.pro
+++ b/src/Qtx/Qtx.pro
@@ -5,12 +5,6 @@ include(../Common.pro)
 
 CONFIG += embed_manifest_exe
 
-win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
-
-DESTDIR = ../../$(CONFIG_ID)/lib
-MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
-
 win32:LIBS *= -L$(QTLIB)
 win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
@@ -18,18 +12,3 @@ QT += xml
 
 win32:DEFINES += WNT WIN32
 DEFINES += QTX_EXPORTS
-
-HEADERS     = *.h
-
-SOURCES     = *.cxx
-
-win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
-win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.input = HEADERS
-win32:QMAKE_EXTRA_COMPILERS += copy_hdr
-
-includes.files = $$HEADERS
-includes.path = ../../include
-
-INSTALLS += includes

diff --git a/src/Resources.pro b/src/Resources.pro
new file mode 100755 (executable)
index 0000000..4499158
--- /dev/null
+++ b/src/Resources.pro
@@ -0,0 +1,15 @@
+isEmpty( RES_FILES ):RES_FILES = resources/*.png
+
+win32:SOURCES+=$$RES_FILES
+win32:Resource=$$RES_FILES
+win32:copy_res.name = Install resources ${QMAKE_FILE_IN}
+win32:copy_res.commands = type ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+# Take into account extra "resources\" prefix in the file name
+win32:copy_res.output = $${GUIResources}\\..\\${QMAKE_FILE_NAME}
+win32:copy_res.input = Resource
+win32:QMAKE_EXTRA_COMPILERS += copy_res
+
+resources.files = $$RES_FILES
+resources.path = ../../resources
+
+INSTALLS += resources

diff --git a/src/STD/STD.pro b/src/STD/STD.pro
index 4ea94846e1db489721f00e2636131b5bebbce9ff..ceabd7f726920b250314bfd4b1994b28c543f13c 100644 (file)
--- a/src/STD/STD.pro
+++ b/src/STD/STD.pro
@@ -3,61 +3,15 @@ win32:TEMPLATE = vclib
 
 include(../Common.pro)
 
-win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
-
-DESTDIR = ../../$(CONFIG_ID)/lib
-MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
-
-INCLUDEPATH = ../../include
-LIBS += -L../../$(CONFIG_ID)/lib -lSUIT -lQtx
+LIBS += -lSUIT -lQtx
 win32:LIBS *= -L$(QTLIB)
 win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 win32:DEFINES += WNT WIN32
 DEFINES += STD_EXPORTS
 
-HEADERS = *.h
-
-SOURCES = *.cxx
-
-TRANSLATIONS = resources/STD_images.ts \
-               resources/STD_msg_en.ts
-
-unix:GUIResources = ../../resources
-win32:GUIResources = ..\\..\\resources
-
-lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_IN} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.input = TRANSLATIONS
-unix:lrelease.clean = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.CONFIG += no_link target_predeps
-QMAKE_EXTRA_COMPILERS += lrelease
-
-win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
-win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.input = HEADERS
-win32:QMAKE_EXTRA_COMPILERS += copy_hdr
-
-ICONS   = resources/*.png
-
-win32:SOURCES+=$$ICONS
-win32:Resource=$$ICONS
-win32:copy_res.name = Install resources ${QMAKE_FILE_IN}
-win32:copy_res.commands = type ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-win32:copy_res.output = $${GUIResources}\\${QMAKE_FILE_BASE}.png
-win32:copy_res.input = Resource
-win32:QMAKE_EXTRA_COMPILERS += copy_res
-
-includes.files = $$HEADERS
-includes.path = ../../include
+include(../Translations.pro)
 
-resources.files = $$ICONS resources/*.xml resources/*.ini
-resources.path = ../../resources
+RES_FILES = resources/*.png resources/*.ini resources/*.xml 
+include(../Resources.pro)
 
-INSTALLS += includes resources

diff --git a/src/SUIT/SUIT.pro b/src/SUIT/SUIT.pro
index a7ef2712986ac58c6379d2b6ac98147a67af451b..175132e74e8dcd9a61d9d9c54eb3251fa57443bf 100644 (file)
--- a/src/SUIT/SUIT.pro
+++ b/src/SUIT/SUIT.pro
@@ -3,60 +3,11 @@ win32:TEMPLATE = vclib
 
 include(../Common.pro)
 
-win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
-
-DESTDIR = ../../$(CONFIG_ID)/lib
-MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
-
-INCLUDEPATH = ../../include
-LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lObjBrowser
-win32:LIBS *= -L$(QTLIB)
+LIBS += -lQtx -lObjBrowser
+win32:LIBS *= -L$(QTLIB) -lUserenv
 win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 win32:DEFINES += WNT WIN32
 DEFINES += SUIT_EXPORTS DISABLE_TESTRECORDER
 
-HEADERS = *.h
-
-SOURCES = *.cxx
-
-TRANSLATIONS = resources/SUIT_msg_en.ts
-
-unix:GUIResources = ../../resources
-win32:GUIResources = ..\\..\\resources
-
-lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_IN} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.input = TRANSLATIONS
-unix:lrelease.clean = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.CONFIG += no_link target_predeps
-QMAKE_EXTRA_COMPILERS += lrelease
-
-win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
-win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.input = HEADERS
-win32:QMAKE_EXTRA_COMPILERS += copy_hdr
-
-ICONS   = resources/*.png
-
-win32:SOURCES+=$$ICONS
-win32:Resource=$$ICONS
-win32:copy_res.name = Install resources ${QMAKE_FILE_IN}
-win32:copy_res.commands = type ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-win32:copy_res.output = $${GUIResources}\\${QMAKE_FILE_BASE}.png
-win32:copy_res.input = Resource
-win32:QMAKE_EXTRA_COMPILERS += copy_res
-
-includes.files = $$HEADERS
-includes.path = ../../include
-
-resources.files = $$ICONS
-resources.path = ../../resources
-
-INSTALLS += includes resources
+include(../Translations.pro)

diff --git a/src/SUITApp/SUITApp.pro b/src/SUITApp/SUITApp.pro
index 09a412c22d23037afc66decd8f43397ea0993d54..a8a07e55737fe3c74069d9cf78f19a7a8f8147b1 100644 (file)
--- a/src/SUITApp/SUITApp.pro
+++ b/src/SUITApp/SUITApp.pro
@@ -4,26 +4,12 @@ win32:TEMPLATE = vcapp
 include(../Common.pro)
 CONFIG -= embed_manifest_exe
 
-win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
-
-DESTDIR = ../../$(CONFIG_ID)/bin
-MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
-
-INCLUDEPATH = ../../include
-LIBS += -L../../$(CONFIG_ID)/lib -lSUIT -lQtx -lStyle -lObjBrowser
-win32:LIBS *= -L$(QTLIB)
+LIBS += -lSUIT -lQtx -lStyle -lObjBrowser
+win32:LIBS *= -L$(QTLIB) -lUserenv
 win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 win32:DEFINES += WNT WIN32
 DEFINES += DISABLE_TESTRECORDER
 
-HEADERS = *.h
-
-SOURCES = *.cxx
+include(../Translations.pro)
 
-win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
-win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.input = HEADERS
-win32:QMAKE_EXTRA_COMPILERS += copy_hdr

diff --git a/src/SVTK/SVTK.pro b/src/SVTK/SVTK.pro
index 1af08e8394042cb1a16ca37fa4c418c2f52f277c..cad10b3599df9b825bf658f72ad889a217b17b4c 100644 (file)
--- a/src/SVTK/SVTK.pro
+++ b/src/SVTK/SVTK.pro
@@ -3,12 +3,6 @@ win32:TEMPLATE = vclib
 
 include(../Common.pro)
 
-win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
-
-DESTDIR = ../../$(CONFIG_ID)/lib
-MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
-
 unix:VTK_LIBS = -L$$(VTKLIB) -lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets   -lGL -L/usr/X11R6/lib -lGLU -L/usr/X11R6/lib -lX11 -lXt
 win32:VTK_LIBS = -L$$(VTKLIB) -lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets -lopengl32
 
@@ -17,8 +11,8 @@ CAS_CPPFLAGS = $(CASINC)
 unix:OCC_LIBS = 
 win32:OCC_LIBS = -L$(CASLIB) -lTKernel
 
-INCLUDEPATH += ../../include $${CAS_CPPFLAGS} $$(VTKINC) $$(BOOSTINC) ../Qtx ../SUIT ../OBJECT ../Prs ../VTKViewer
-LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT -lOBJECT -lPrs -lVTKViewer $${OCC_LIBS} $${VTK_LIBS}
+INCLUDEPATH += $${CAS_CPPFLAGS} $$(VTKINC) $$(BOOSTINC) ../Qtx ../SUIT ../OBJECT ../Prs ../VTKViewer
+LIBS += -lQtx -lSUIT -lOBJECT -lPrs -lVTKViewer $${OCC_LIBS} $${VTK_LIBS}
 win32: LIBS += -lTKernel
 win32:LIBS *= -L$(QTLIB)
 win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
@@ -26,107 +20,5 @@ win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 win32:DEFINES += WNT WIN32 
 DEFINES += SVTK_EXPORTS $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
 
-HEADERS  = SVTK.h
-HEADERS += SVTK_Prs.h
-HEADERS += SVTK_Actor.h
-HEADERS += SALOME_Actor.h
-HEADERS += SVTK_RectPicker.h
-HEADERS += SVTK_DeviceActor.h
-HEADERS += SVTK_Actor2DWidget.h
-HEADERS += SVTK_CaptionActor2DWidget.h
-HEADERS += SVTK_NonIsometricDlg.h
-HEADERS += SVTK_TextRegionDlg.h
-HEADERS += SVTK_UpdateRateDlg.h
-HEADERS += SVTK_CubeAxesDlg.h
-
-HEADERS += SVTK_DialogBase.h
-HEADERS += SVTK_FontWidget.h
-HEADERS += SVTK_CubeAxesActor2D.h
-HEADERS += SVTK_Functor.h
-HEADERS += SVTK_MainWindow.h
-HEADERS += SVTK_View.h
-HEADERS += SVTK_ViewManager.h
-HEADERS += SVTK_ViewModel.h
-HEADERS += SVTK_ViewWindow.h
-HEADERS += SVTK_Renderer.h
-HEADERS += SVTK_InteractorStyle.h
-HEADERS += SVTK_RenderWindowInteractor.h
-HEADERS += SVTK_GenericRenderWindowInteractor.h
-HEADERS += SVTK_Selector.h
-HEADERS += SVTK_Selection.h
-HEADERS += SVTK_SelectionEvent.h
-HEADERS += SVTK_SpaceMouse.h
-HEADERS += SVTK_Event.h
-HEADERS += SVTK_ViewModelBase.h
-HEADERS += SVTK_SetRotationPointDlg.h
-HEADERS += SVTK_Extension.h
-
-SOURCES  = SVTK_Prs.cxx
-SOURCES += SVTK_Actor.cxx
-SOURCES += SALOME_Actor.cxx
-SOURCES += SVTK_RectPicker.cxx
-SOURCES += SVTK_DeviceActor.cxx
-SOURCES += SVTK_Actor2DWidget.cxx
-SOURCES += SVTK_CaptionActor2DWidget.cxx
-SOURCES += SVTK_CubeAxesActor2D.cxx
-SOURCES += SVTK_NonIsometricDlg.cxx
-SOURCES += SVTK_UpdateRateDlg.cxx
-SOURCES += SVTK_TextRegionDlg.cxx
-SOURCES += SVTK_CubeAxesDlg.cxx
-SOURCES += SVTK_DialogBase.cxx
-SOURCES += SVTK_FontWidget.cxx
-SOURCES += SVTK_Trihedron.cxx
-SOURCES += SVTK_MainWindow.cxx
-SOURCES += SVTK_View.cxx
-SOURCES += SVTK_ViewManager.cxx
-SOURCES += SVTK_ViewModel.cxx
-SOURCES += SVTK_Renderer.cxx
-SOURCES += SVTK_ViewWindow.cxx
-SOURCES += SVTK_InteractorStyle.cxx
-SOURCES += SVTK_RenderWindowInteractor.cxx
-SOURCES += SVTK_GenericRenderWindowInteractor.cxx
-SOURCES += SVTK_SpaceMouse.cxx
-SOURCES += SVTK_Selector.cxx
-SOURCES += SVTK_SetRotationPointDlg.cxx
-SOURCES += SVTK_Extension.cxx
-
-TRANSLATIONS = resources/SVTK_images.ts \
-               resources/SVTK_msg_en.ts
-
-unix:GUIResources = ../../resources
-win32:GUIResources = ..\\..\\resources
-
-lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_IN} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.input = TRANSLATIONS
-unix:lrelease.clean = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.CONFIG += no_link target_predeps
-QMAKE_EXTRA_COMPILERS += lrelease
-
-win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
-win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.input = HEADERS
-win32:QMAKE_EXTRA_COMPILERS += copy_hdr
-
-ICONS   = resources/*.png
-
-win32:SOURCES+=$$ICONS
-win32:Resource=$$ICONS
-win32:copy_res.name = Install resources ${QMAKE_FILE_IN}
-win32:copy_res.commands = type ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-win32:copy_res.output = $${GUIResources}\\${QMAKE_FILE_BASE}.png
-win32:copy_res.input = Resource
-win32:QMAKE_EXTRA_COMPILERS += copy_res
-
-includes.files = $$HEADERS
-includes.path = ../../include
-
-resources.files = $$ICONS
-resources.path = ../../resources
-
-INSTALLS += includes resources
+include(../Translations.pro)
+include(../Resources.pro)

diff --git a/src/Style/Style.pro b/src/Style/Style.pro
index 328b0453be7cea6b743d717f28f0c3a6907a2f48..1c32c72bf5512c0c2c9271a6c968d2de9700229b 100644 (file)
--- a/src/Style/Style.pro
+++ b/src/Style/Style.pro
@@ -3,31 +3,9 @@ win32:TEMPLATE = vclib
 
 include(../Common.pro)
 
-win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
-
-DESTDIR =  ../../$(CONFIG_ID)/lib
-MOC_DIR =  ../../moc
-OBJECTS_DIR =  ../../$(CONFIG_ID)/obj/$$TARGET
-
-INCLUDEPATH =  ../../include
-LIBS += -L../../$(CONFIG_ID)/lib -lQtx
+LIBS += -lQtx
 win32:LIBS *= -L$(QTLIB)
 win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 win32:DEFINES += WNT WIN32
 DEFINES += STYLE_SALOME_EXPORTS
-
-HEADERS = *.h
-
-SOURCES = *.cxx
-
-win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
-win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.input = HEADERS
-win32:QMAKE_EXTRA_COMPILERS += copy_hdr
-
-includes.files = $$HEADERS
-includes.path =  ../../include
-
-INSTALLS += includes

diff --git a/src/TableViewer/TableViewer.pro b/src/TableViewer/TableViewer.pro
index d60e9d65efb5d1270858125c6ebcb9bf6c21130c..753f0a2df57370914e37dd1b559df7dc80defdf7 100644 (file)
--- a/src/TableViewer/TableViewer.pro
+++ b/src/TableViewer/TableViewer.pro
@@ -3,64 +3,16 @@ win32:TEMPLATE = vclib
 
 include(../Common.pro)
 
-win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
-
-DESTDIR = ../../$(CONFIG_ID)/lib
-MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
-
 CAS_CPPFLAGS = $(CASINC)
 CAS_KERNEL = -L$(CASLIB) -lTKernel
 
-INCLUDEPATH = ../../include  $${CAS_CPPFLAGS}
-LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT $${CAS_KERNEL} -lHTMLService
+INCLUDEPATH += $${CAS_CPPFLAGS}
+LIBS += -lQtx -lSUIT $${CAS_KERNEL} -lHTMLService
 win32:LIBS *= -L$(QTLIB)
 win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 win32:DEFINES += WNT WIN32
 DEFINES += TABLEVIEWER_EXPORTS $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
 
-HEADERS = *.h
-
-SOURCES = *.cxx
-
-TRANSLATIONS = resources/TableViewer_images.ts \
-               resources/TableViewer_msg_en.ts
-
-unix:GUIResources = ../../resources
-win32:GUIResources = ..\\..\\resources
-
-lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_IN} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.input = TRANSLATIONS
-unix:lrelease.clean = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.CONFIG += no_link target_predeps
-QMAKE_EXTRA_COMPILERS += lrelease
-
-win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
-win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.input = HEADERS
-win32:QMAKE_EXTRA_COMPILERS += copy_hdr
-
-ICONS   = resources/*.png
-
-win32:Resource=$$ICONS
-win32:SOURCES+=$$ICONS
-win32:copy_res.name = Install resources ${QMAKE_FILE_IN}
-win32:copy_res.commands = type ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-win32:copy_res.output = $${GUIResources}\\${QMAKE_FILE_BASE}.png
-win32:copy_res.input = Resource
-win32:QMAKE_EXTRA_COMPILERS += copy_res
-
-includes.files = $$HEADERS
-includes.path = ../../include
-
-resources.files = $$ICONS
-resources.path = ../../resources
-
-INSTALLS += includes resources
+include(../Translations.pro)
+include(../Resources.pro)

diff --git a/src/Translations.pro b/src/Translations.pro
new file mode 100755 (executable)
index 0000000..3ed3e6f
--- /dev/null
+++ b/src/Translations.pro
@@ -0,0 +1,13 @@
+isEmpty( TRANSLATIONS ):TRANSLATIONS = resources/*.ts
+
+lrelease.name = LRELASE ${QMAKE_FILE_IN}
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_IN} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+lrelease.input = TRANSLATIONS
+unix:lrelease.clean = $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+lrelease.CONFIG += no_link target_predeps
+QMAKE_EXTRA_COMPILERS += lrelease
+

diff --git a/src/VTKViewer/VTKViewer.pro b/src/VTKViewer/VTKViewer.pro
index b9f4d24681ecb4bc73bde34ad70c761d0bb95703..e5fa8bf25ee21a87da8dfa3ac403618d4aee5713 100644 (file)
--- a/src/VTKViewer/VTKViewer.pro
+++ b/src/VTKViewer/VTKViewer.pro
@@ -3,12 +3,6 @@ win32:TEMPLATE = vclib
 
 include(../Common.pro)
 
-win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
-
-DESTDIR = ../../$(CONFIG_ID)/lib
-MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
-
 unix:VTK_LIBS = -L$$(VTKLIB) -lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets   -lGL -L/usr/X11R6/lib -lGLU -L/usr/X11R6/lib -lX11 -lXt
 win32:VTK_LIBS = -L$$(VTKLIB) -lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets
 
@@ -16,94 +10,15 @@ CAS_CPPFLAGS = $(CASINC)
 
 CAS_KERNEL = -L$(CASLIB) -lTKernel
 
-INCLUDEPATH += ../../include $$(VTKINC) $${CAS_CPPFLAGS} ../Qtx ../SUIT
-LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT $${VTK_LIBS} $${CAS_KERNEL}
+INCLUDEPATH += $$(VTKINC) $${CAS_CPPFLAGS} ../Qtx ../SUIT
+LIBS += -lQtx -lSUIT $${VTK_LIBS} $${CAS_KERNEL}
 win32:LIBS *= -L$(QTLIB)
 win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 win32:DEFINES += WNT WIN32 
 DEFINES += VTKVIEWER_EXPORTS $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
 
-HEADERS  = VTKViewer.h
-HEADERS += VTKViewer_CellLocationsArray.h
-HEADERS += VTKViewer_Actor.h
-HEADERS += VTKViewer_ExtractUnstructuredGrid.h
-HEADERS += VTKViewer_ConvexTool.h
-HEADERS += VTKViewer_Filter.h
-HEADERS += VTKViewer_GeometryFilter.h
-HEADERS += VTKViewer_AppendFilter.h
-HEADERS += VTKViewer_Algorithm.h
-HEADERS += VTKViewer_InteractorStyle.h
-HEADERS += VTKViewer_RenderWindow.h
-HEADERS += VTKViewer_RenderWindowInteractor.h
-HEADERS += VTKViewer_ShrinkFilter.h
-HEADERS += VTKViewer_TransformFilter.h
-HEADERS += VTKViewer_Transform.h
-HEADERS += VTKViewer_Trihedron.h
-HEADERS += VTKViewer_Utilities.h
-HEADERS += VTKViewer_ViewManager.h
-HEADERS += VTKViewer_ViewModel.h
-HEADERS += VTKViewer_ViewWindow.h
-HEADERS += VTKViewer_Functor.h
-
-SOURCES  = VTKViewer_CellLocationsArray.cxx
-SOURCES += VTKViewer_Actor.cxx
-SOURCES += VTKViewer_ExtractUnstructuredGrid.cxx
-SOURCES += VTKViewer_Filter.cxx
-SOURCES += VTKViewer_GeometryFilter.cxx
-SOURCES += VTKViewer_AppendFilter.cxx
-SOURCES += VTKViewer_InteractorStyle.cxx
-SOURCES += VTKViewer_RenderWindow.cxx
-SOURCES += VTKViewer_RenderWindowInteractor.cxx
-SOURCES += VTKViewer_ShrinkFilter.cxx
-SOURCES += VTKViewer_Transform.cxx
-SOURCES += VTKViewer_TransformFilter.cxx
-SOURCES += VTKViewer_Trihedron.cxx
-SOURCES += VTKViewer_Utilities.cxx
-SOURCES += VTKViewer_ViewManager.cxx
-SOURCES += VTKViewer_ViewModel.cxx
-SOURCES += VTKViewer_ConvexTool.cxx
-SOURCES += VTKViewer_ViewWindow.cxx
-
 unix:message ( "Sources: $$SOURCES " )
 
-TRANSLATIONS = resources/VTKViewer_images.ts \
-               resources/VTKViewer_msg_en.ts
-
-unix:GUIResources = ../../resources
-win32:GUIResources = ..\\..\\resources
-
-lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_IN} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.input = TRANSLATIONS
-unix:lrelease.clean = $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
-lrelease.CONFIG += no_link target_predeps
-QMAKE_EXTRA_COMPILERS += lrelease
-
-win32:copy_hdr.name = Install ${QMAKE_FILE_IN}
-win32:copy_hdr.commands = type ${QMAKE_FILE_IN} > ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.output = ../../include/${QMAKE_FILE_BASE}.h
-win32:copy_hdr.input = HEADERS
-win32:QMAKE_EXTRA_COMPILERS += copy_hdr
-
-ICONS   = resources/*.png
-
-win32:SOURCES+=$$ICONS
-win32:Resource=$$ICONS
-win32:copy_res.name = Install resources ${QMAKE_FILE_IN}
-win32:copy_res.commands = type ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-win32:copy_res.output = $${GUIResources}\\${QMAKE_FILE_BASE}.png
-win32:copy_res.input = Resource
-win32:QMAKE_EXTRA_COMPILERS += copy_res
-
-includes.files = $$HEADERS
-includes.path = ../../include
-
-resources.files = $$ICONS
-resources.path = ../../resources
-
-INSTALLS += includes resources
+include(../Translations.pro)
+include(../Resources.pro)