Issue 0020194: EDF 977 ALL: Get rid of warnings PACKAGE_VERSION already defined

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 36ad8c3a7c7e37c3da0591452c8cc09f24250858..cd851519b43b9a45f237e8476506361a49c93fb6 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -19,6 +19,14 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
+# ============================================================
+# The following is to avoid PACKAGE_... env variable
+# redefinition compilation warnings
+# ============================================================
+AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
+AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
+
 # ============================================================
 # This file defines the common definitions used in several
 # Makefile. This file must be included, if needed, by the file

diff --git a/build_configure b/build_configure
index dbbf3ba87eae18d68fa25e236000b6ce1d53689d..8eb1500fd32f672a7a8eae800a1763b4d0e3d05b 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -53,31 +53,14 @@ ABS_CONF_DIR=`pwd`
 
 #######################################################################
 
-mkdir -p salome_adm/unix/config_files
-#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/* salome_adm/unix/config_files
-#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/pythonbe.py salome_adm/unix
-
-cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix
-
-#cp -f ${GUI_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
-
-# remove KERNEL deprecated configure files
-#for deprecated in ac_cc_warnings.m4 ac_cxx_partial_specialization.m4 \
-#  check_mico.m4 config.guess ltmain.sh ac_cxx_bool.m4 ltconfig ac_cxx_typename.m4 \
-#    check_pthreads.m4 config.sub libtool.m4 ac_cxx_mutable.m4 missing
-#    do
-#      rm -f salome_adm/unix/config_files/${deprecated}
-#      done
-             
-
 # ____________________________________________________________________
 # aclocal creates the aclocal.m4 file from the standard macro and the
-# custom macro embedded in the directory salome_adm/unix/config_files
-# and KERNEL config_files directory.
+# custom macro embedded in the directory adm_local/unix/config_files
+# and KERNEL salome_adm/unix/config_files directory.
 # output:
 #   aclocal.m4
 #   autom4te.cache (directory)
-echo "====================================================== aclocal"
+echo "======================================================= aclocal"
 
 aclocal -I adm_local/unix/config_files \
         -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1
@@ -88,10 +71,10 @@ aclocal -I adm_local/unix/config_files \
 # version. The files are created in the directory specified with the
 # AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac).
 # output:
-#   salome_adm/unix/config_files/config.guess
-#   salome_adm/unix/config_files/config.sub
-#   salome_adm/unix/config_files/ltmain.sh
-#echo "====================================================== libtoolize"
+#   adm_local/unix/config_files/config.guess
+#   adm_local/unix/config_files/config.sub
+#   adm_local/unix/config_files/ltmain.sh
+echo "==================================================== libtoolize"
 
 libtoolize --force --copy --automake || exit 1
 
@@ -111,11 +94,11 @@ autoconf
 # AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac). This step also
 # creates the Makefile.in files from the Makefile.am files.
 # output:
-#   salome_adm/unix/config_files/compile
-#   salome_adm/unix/config_files/depcomp
-#   salome_adm/unix/config_files/install-sh
-#   salome_adm/unix/config_files/missing
-#   salome_adm/unix/config_files/py-compile
+#   adm_local/unix/config_files/compile
+#   adm_local/unix/config_files/depcomp
+#   adm_local/unix/config_files/install-sh
+#   adm_local/unix/config_files/missing
+#   adm_local/unix/config_files/py-compile
 #   Makefile.in (from Makefile.am)
 echo "====================================================== automake"
 

diff --git a/configure.ac b/configure.ac
index 9461357ed6e0ef3854cb7fb60a56e1f1075b0311..5a45547ec971cb136b227d6245d0f3ee0cad4d10 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@
 # Created from configure.in.base
 #
 AC_INIT([Salome2 Project GEOM module], [5.1.2], [webmaster.salome@opencascade.com], [SalomeGEOM])
-AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
+AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([tar-pax -Wno-portability])
@@ -108,7 +108,7 @@ dnl Fix up the INSTALL macro if it s a relative path. We want the
 dnl full-path to the binary instead.
 case "$INSTALL" in
    *install-sh*)
-      INSTALL='\${ROOT_BUILDDIR}'/salome_adm/unix/config_files/install-sh
+      INSTALL='\${ROOT_BUILDDIR}'/adm_local/unix/config_files/install-sh
       ;;
 esac
 
@@ -374,7 +374,6 @@ echo
 # autoscan, the Makefile list is generated in the output file configure.scan.
 # This could be helpfull to update de configuration.
 AC_OUTPUT([ \
-  salome_adm/unix/SALOMEconfig.h \
   adm_local/Makefile \
   adm_local/cmake_files/Makefile \
   adm_local/unix/Makefile \

diff --git a/idl/Makefile.am b/idl/Makefile.am
index 258c691e935f1d2e46d444f5b571d9acbb65c6fe..e7bf544b596242f2e6985b080fed57d961284ea0 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -41,7 +41,6 @@ nodist_libSalomeIDLGEOM_la_SOURCES = GEOM_GenSK.cc GEOM_SupervSK.cc
 nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
 
 libSalomeIDLGEOM_la_CPPFLAGS =                 \
-       -I$(top_builddir)/salome_adm/unix       \
        -I$(top_builddir)/idl                   \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @KERNEL_CXXFLAGS@
 libSalomeIDLGEOM_la_LDFLAGS = -no-undefined -version-info=0:0:0
@@ -51,7 +50,7 @@ libSalomeIDLGEOM_la_LIBADD  = $(STDLIB) @CORBA_LIBS@ $(KERNEL_LDFLAGS) -lSalomeI
 OMNIORB_IDL         = @OMNIORB_IDL@
 OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
 OMNIORB_IDLPYFLAGS  = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome 
-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(top_builddir)/salome_adm/unix
+IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome
 IDLPYFLAGS  = @IDLPYFLAGS@ -I$(KERNEL_ROOT_DIR)/idl/salome
 
 # potential problem on parallel make on the following - multiple outputs

diff --git a/src/BasicGUI/Makefile.am b/src/BasicGUI/Makefile.am
index 4253ea5a542c846ae9f7578682bc8ddc1730efc3..e8e4a0733f59fba21795b872bf0e9437c94eaf34 100644 (file)
--- a/src/BasicGUI/Makefile.am
+++ b/src/BasicGUI/Makefile.am
@@ -94,8 +94,7 @@ libBasicGUI_la_CPPFLAGS =                     \
        -I$(srcdir)/../GEOMImpl                 \
        -I$(srcdir)/../GEOMClient               \
        -I$(top_builddir)/src/DlgRef            \
-       -I$(top_builddir)/idl                   \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 
 libBasicGUI_la_LDFLAGS  =                                      \

diff --git a/src/BlocksGUI/Makefile.am b/src/BlocksGUI/Makefile.am
index 7ad9706cc3fe5441ffecae40788b965768888615..f075e7751685badc45bcceb5778515fbba07029f 100644 (file)
--- a/src/BlocksGUI/Makefile.am
+++ b/src/BlocksGUI/Makefile.am
@@ -77,8 +77,7 @@ libBlocksGUI_la_CPPFLAGS =                    \
        -I$(srcdir)/../GEOMImpl                 \
        -I$(srcdir)/../GEOMFiltersSelection     \
        -I$(top_builddir)/src/DlgRef            \
-       -I$(top_builddir)/idl                   \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libBlocksGUI_la_LDFLAGS  =                                     \
        ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \

diff --git a/src/BooleanGUI/Makefile.am b/src/BooleanGUI/Makefile.am
index fbea5743738238f8b187ef5a0848f30d4d060800..e88c457d1f0fff178969cd040c45a935bf870bfa 100644 (file)
--- a/src/BooleanGUI/Makefile.am
+++ b/src/BooleanGUI/Makefile.am
@@ -68,8 +68,7 @@ libBooleanGUI_la_CPPFLAGS =                   \
        -I$(srcdir)/../GEOMImpl                 \
        -I$(srcdir)/../GEOMFiltersSelection     \
        -I$(top_builddir)/src/DlgRef            \
-       -I$(top_builddir)/idl                   \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libBooleanGUI_la_LDFLAGS  =            \
        ../GEOMBase/libGEOMBase.la

diff --git a/src/BuildGUI/Makefile.am b/src/BuildGUI/Makefile.am
index d4f2af5489314bb57b24e7cf09e7aad04ed7e22c..b69181d4e5bc774680585e470d95bde974238087 100644 (file)
--- a/src/BuildGUI/Makefile.am
+++ b/src/BuildGUI/Makefile.am
@@ -80,8 +80,7 @@ libBuildGUI_la_CPPFLAGS =                     \
        -I$(srcdir)/../GEOMImpl                 \
        -I$(srcdir)/../GEOMFiltersSelection     \
        -I$(top_builddir)/idl                   \
-       -I$(top_builddir)/src/DlgRef            \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/src/DlgRef
 
 libBuildGUI_la_LDFLAGS =                                       \
        ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \

diff --git a/src/DisplayGUI/Makefile.am b/src/DisplayGUI/Makefile.am
index 434048fe171e06c3298e1071648f4403f4f079ac..76f2d510283dda702f4dfbee886410fcbe7b7710 100644 (file)
--- a/src/DisplayGUI/Makefile.am
+++ b/src/DisplayGUI/Makefile.am
@@ -53,8 +53,7 @@ libDisplayGUI_la_CPPFLAGS =           \
        -I$(srcdir)/../OBJECT           \
        -I$(srcdir)/../GEOMImpl         \
        -I$(srcdir)/../GEOMClient       \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libDisplayGUI_la_LDFLAGS =             \
        ../GEOMGUI/libGEOM.la           \

diff --git a/src/EntityGUI/Makefile.am b/src/EntityGUI/Makefile.am
index f54555614ef64234e1cfa9c48d0d9c1f56c9c916..996563de739dbe1c55c960497bfb9656316e1c16 100644 (file)
--- a/src/EntityGUI/Makefile.am
+++ b/src/EntityGUI/Makefile.am
@@ -87,8 +87,7 @@ libEntityGUI_la_CPPFLAGS =                    \
        -I$(srcdir)/../GEOMFiltersSelection     \
        -I$(srcdir)/../SKETCHER                 \
        -I$(top_builddir)/src/DlgRef            \
-       -I$(top_builddir)/idl                   \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libEntityGUI_la_LDFLAGS  =                                     \
        ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \

diff --git a/src/GEOM/Makefile.am b/src/GEOM/Makefile.am
index 233b5139af0fc48bd363d704c759a86e2d691891..981038f907bf141cfd51aa4e66b765a6296e3ab6 100644 (file)
--- a/src/GEOM/Makefile.am
+++ b/src/GEOM/Makefile.am
@@ -71,8 +71,7 @@ libGEOMbasic_la_CPPFLAGS =    \
        $(CAS_CPPFLAGS)         \
        $(KERNEL_CXXFLAGS)      \
        $(BOOST_CPPFLAGS)       \
-       -I$(top_builddir)/idl   \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libGEOMbasic_la_LDFLAGS  =                     \
        $(CORBA_LIBS)                           \

diff --git a/src/GEOMBase/Makefile.am b/src/GEOMBase/Makefile.am
index 5c7b9bdb970b468f4adcb4f7453f48c0d6b3bd51..a9db07b781b880892974fc192e9bd140c8aaf62c 100644 (file)
--- a/src/GEOMBase/Makefile.am
+++ b/src/GEOMBase/Makefile.am
@@ -67,8 +67,7 @@ libGEOMBase_la_CPPFLAGS =             \
        -I$(srcdir)/../GEOMGUI          \
        -I$(srcdir)/../DlgRef           \
        -I$(top_builddir)/src/DlgRef    \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libGEOMBase_la_LDFLAGS  =              \
        ../../idl/libSalomeIDLGEOM.la   \

diff --git a/src/GEOMClient/Makefile.am b/src/GEOMClient/Makefile.am
index f66b57921fddb6390a9aa11ec458333a93cc0f9a..2fc3b38f5d02d9c7957c8f0856a8f531fb335b96 100644 (file)
--- a/src/GEOMClient/Makefile.am
+++ b/src/GEOMClient/Makefile.am
@@ -46,8 +46,7 @@ libGEOMClient_la_CPPFLAGS =   \
         $(CORBA_INCLUDES)      \
        $(CAS_CPPFLAGS)         \
        $(KERNEL_CXXFLAGS)      \
-       -I$(top_builddir)/idl   \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libGEOMClient_la_LDFLAGS  =                            \
        ../../idl/libSalomeIDLGEOM.la                   \

diff --git a/src/GEOMFiltersSelection/Makefile.am b/src/GEOMFiltersSelection/Makefile.am
index b25fd978871bc10cf4e48e0590b302e4fb9e2edd..7a6ba5a5e5e7a57edf82a6cbe5e26cf622149730 100644 (file)
--- a/src/GEOMFiltersSelection/Makefile.am
+++ b/src/GEOMFiltersSelection/Makefile.am
@@ -62,8 +62,7 @@ libGEOMFiltersSelection_la_CPPFLAGS = \
        $(CORBA_CXXFLAGS)               \
        $(CORBA_INCLUDES)               \
        -I$(srcdir)/../GEOMClient       \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libGEOMFiltersSelection_la_LDFLAGS  = \
        $(QT_MT_LIBS) \

diff --git a/src/GEOMGUI/Makefile.am b/src/GEOMGUI/Makefile.am
index 1d2ffde06b329a1d55d4b2cb15deb4cd8bceb91c..acb2cc00951ad45b63d9c46dee49d4e18aab93bc 100644 (file)
--- a/src/GEOMGUI/Makefile.am
+++ b/src/GEOMGUI/Makefile.am
@@ -76,8 +76,7 @@ libGEOM_la_CPPFLAGS =                         \
        -I$(srcdir)/../GEOMFiltersSelection     \
        -I$(srcdir)/../GEOMClient               \
        -I$(srcdir)/../GEOMImpl                 \
-       -I$(top_builddir)/idl                   \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libGEOM_la_LDFLAGS =                                           \
        ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \

diff --git a/src/GEOMImpl/Makefile.am b/src/GEOMImpl/Makefile.am
index eb02b29291bdecdeea79bf337b8382b7d7a7ca7d..1c403da1b8fc20758c791d2f85a142deb7c05843 100644 (file)
--- a/src/GEOMImpl/Makefile.am
+++ b/src/GEOMImpl/Makefile.am
@@ -218,8 +218,7 @@ libGEOMimpl_la_CPPFLAGS =           \
        -I$(srcdir)/../GEOMAlgo         \
        -I$(srcdir)/../SKETCHER         \
        -I$(srcdir)/../ARCHIMEDE        \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libGEOMimpl_la_LDFLAGS  =                      \
        ../GEOM/libGEOMbasic.la                 \

diff --git a/src/GEOMToolsGUI/Makefile.am b/src/GEOMToolsGUI/Makefile.am
index d07577bf264ec515ff210b04ad7804872bf5cfa9..e71300c9224f21e2540ffd3bde0400769795c523 100644 (file)
--- a/src/GEOMToolsGUI/Makefile.am
+++ b/src/GEOMToolsGUI/Makefile.am
@@ -69,8 +69,7 @@ libGEOMToolsGUI_la_CPPFLAGS =         \
        -I$(srcdir)/../GEOMGUI          \
        -I$(srcdir)/../GEOMClient       \
        -I$(srcdir)/../GEOMImpl         \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libGEOMToolsGUI_la_LDFLAGS  =          \
        ../GEOMBase/libGEOMBase.la      \

diff --git a/src/GEOM_I/Makefile.am b/src/GEOM_I/Makefile.am
index 5a6e6caa074fb1f9af7deeb917ca557455a06349..6ab126dd7bd1d5eb4eba97012ff501c04ed4a471 100644 (file)
--- a/src/GEOM_I/Makefile.am
+++ b/src/GEOM_I/Makefile.am
@@ -81,8 +81,7 @@ libGEOMEngine_la_CPPFLAGS =           \
        -I$(srcdir)/../GEOMImpl         \
        -I$(srcdir)/../GEOMAlgo         \
        -I$(srcdir)/../GEOM             \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 
 libGEOMEngine_la_LDFLAGS  =                    \

diff --git a/src/GEOM_I_Superv/Makefile.am b/src/GEOM_I_Superv/Makefile.am
index d9fc822cfecda48ced39279086e515bf2699ba94..61c2642523419c3b56f22ec6d14863835b96c26f 100644 (file)
--- a/src/GEOM_I_Superv/Makefile.am
+++ b/src/GEOM_I_Superv/Makefile.am
@@ -56,8 +56,7 @@ libGEOM_SupervEngine_la_CPPFLAGS =    \
        -I$(srcdir)/../GEOM             \
        -I$(srcdir)/../GEOM_I           \
        -I$(srcdir)/../GEOMAlgo         \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libGEOM_SupervEngine_la_LDFLAGS  =     \
         ../GEOM_I/libGEOMEngine.la      \

diff --git a/src/GEOM_SWIG_WITHIHM/Makefile.am b/src/GEOM_SWIG_WITHIHM/Makefile.am
index 1fcd94b42bba03501c7c9acdd0b14e11538518b9..6802d97fd7b9f19dabab7be1baa44e86c0d5913b 100644 (file)
--- a/src/GEOM_SWIG_WITHIHM/Makefile.am
+++ b/src/GEOM_SWIG_WITHIHM/Makefile.am
@@ -74,8 +74,7 @@ _libGEOM_Swig_la_CPPFLAGS =           \
        $(CORBA_CXXFLAGS)               \
        $(CORBA_INCLUDES)               \
        -I$(srcdir)/../GEOMGUI          \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 _libGEOM_Swig_la_LDFLAGS = -module
 _libGEOM_Swig_la_LIBADD  =             \

diff --git a/src/GenerationGUI/Makefile.am b/src/GenerationGUI/Makefile.am
index 8fd63002e37a3126812f634a1ba7fcfcbf3ea252..439e44a83bf4539a202fdb4fd0262b16c12d756f 100644 (file)
--- a/src/GenerationGUI/Makefile.am
+++ b/src/GenerationGUI/Makefile.am
@@ -79,8 +79,7 @@ libGenerationGUI_la_CPPFLAGS =                        \
        -I$(srcdir)/../GEOMImpl                 \
        -I$(srcdir)/../GEOMFiltersSelection     \
        -I$(top_builddir)/src/DlgRef            \
-       -I$(top_builddir)/idl                   \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libGenerationGUI_la_LDFLAGS  =                                 \
        ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \

diff --git a/src/GroupGUI/Makefile.am b/src/GroupGUI/Makefile.am
index 0a93e2c4dd3863e075936c36be8887109de3c01f..66aa6e43919d10e058aa8530ca0e00565dce0b4a 100755 (executable)
--- a/src/GroupGUI/Makefile.am
+++ b/src/GroupGUI/Makefile.am
@@ -67,8 +67,7 @@ libGroupGUI_la_CPPFLAGS =                     \
        -I$(srcdir)/../GEOMImpl                 \
        -I$(srcdir)/../GEOMFiltersSelection     \
        -I$(top_builddir)/src/DlgRef            \
-       -I$(top_builddir)/idl                   \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libGroupGUI_la_LDFLAGS         =                                       \
        ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \

diff --git a/src/MeasureGUI/Makefile.am b/src/MeasureGUI/Makefile.am
index ad0ebe94134198566e3b55b79a9818c1b6d3b294..7c87864f17e7f14c907abe07c1c768660e22bab7 100644 (file)
--- a/src/MeasureGUI/Makefile.am
+++ b/src/MeasureGUI/Makefile.am
@@ -116,8 +116,7 @@ libMeasureGUI_la_CPPFLAGS =         \
        -I$(srcdir)/../GEOMImpl         \
        -I$(srcdir)/../GEOM             \
        -I$(top_builddir)/src/DlgRef    \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libMeasureGUI_la_LDFLAGS  =            \
        $(CAS_LDFLAGS) -lTKGeomBase \

diff --git a/src/OperationGUI/Makefile.am b/src/OperationGUI/Makefile.am
index 3afc0501389191653da1f9b8b02e96943e4a1bcd..fe874c13d7727bf240fb1eb3ceabc7e3cadf8888 100644 (file)
--- a/src/OperationGUI/Makefile.am
+++ b/src/OperationGUI/Makefile.am
@@ -82,8 +82,7 @@ libOperationGUI_la_CPPFLAGS =         \
        -I$(srcdir)/../GEOMImpl         \
        -I$(srcdir)/../GEOMAlgo         \
        -I$(top_builddir)/src/DlgRef    \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libOperationGUI_la_LDFLAGS =           \
        ../GEOMBase/libGEOMBase.la      \

diff --git a/src/PrimitiveGUI/Makefile.am b/src/PrimitiveGUI/Makefile.am
index 4825e3f477790db0e6d9e170362134ff1dca7d42..f0de0e92f8d28ce14452d440f621bf0fd5f13a67 100644 (file)
--- a/src/PrimitiveGUI/Makefile.am
+++ b/src/PrimitiveGUI/Makefile.am
@@ -88,8 +88,7 @@ libPrimitiveGUI_la_CPPFLAGS =                 \
        -I$(srcdir)/../GEOMImpl                 \
        -I$(srcdir)/../GEOMFiltersSelection     \
        -I$(top_builddir)/src/DlgRef            \
-       -I$(top_builddir)/idl                   \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libPrimitiveGUI_la_LDFLAGS =                                   \
        ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \

diff --git a/src/RepairGUI/Makefile.am b/src/RepairGUI/Makefile.am
index 51e90f1bb1cb0b6f81d0afad5c40587d92b185aa..abd9dfb7d8bcadc4df17d339c3eb61f2982b3352 100644 (file)
--- a/src/RepairGUI/Makefile.am
+++ b/src/RepairGUI/Makefile.am
@@ -110,8 +110,7 @@ libRepairGUI_la_CPPFLAGS =                  \
        -I$(srcdir)/../GEOMClient               \
        -I$(srcdir)/../GEOMImpl                 \
        -I$(top_builddir)/src/DlgRef            \
-       -I$(top_builddir)/idl                   \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libRepairGUI_la_LDFLAGS = \
        ../GEOMBase/libGEOMBase.la

diff --git a/src/TransformationGUI/Makefile.am b/src/TransformationGUI/Makefile.am
index 4a3725c81c39de6aae86404a5a82477a05c3d3ea..9846a8a259204da4e90c947b53dd4f385ced24a2 100644 (file)
--- a/src/TransformationGUI/Makefile.am
+++ b/src/TransformationGUI/Makefile.am
@@ -95,8 +95,7 @@ libTransformationGUI_la_CPPFLAGS =            \
        -I$(srcdir)/../GEOMImpl                 \
        -I$(srcdir)/../GEOMFiltersSelection     \
        -I$(top_builddir)/src/DlgRef            \
-       -I$(top_builddir)/idl                   \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libTransformationGUI_la_LDFLAGS  =                             \
        ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \