From: vsr <vsr@opencascade.com>
Date: Thu, 13 Aug 2009 05:08:19 +0000 (+0000)
Subject: Issue 0020194: EDF 977 ALL: Get rid of warnings PACKAGE_VERSION already defined
X-Git-Tag: V5_1_3rc1~52
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=63b2d29eaebaea3e0191cc2bdf8de19056c961b8;p=modules%2Fgeom.git

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 36ad8c3a7..cd851519b 100644
--- 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 dbbf3ba87..8eb1500fd 100755
--- 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 9461357ed..5a45547ec 100644
--- 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 258c691e9..e7bf544b5 100644
--- 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 4253ea5a5..e8e4a0733 100644
--- 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 7ad9706cc..f075e7751 100644
--- 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 fbea57437..e88c457d1 100644
--- 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 d4f2af548..b69181d4e 100644
--- 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 434048fe1..76f2d5102 100644
--- 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 f54555614..996563de7 100644
--- 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 233b5139a..981038f90 100644
--- 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 5c7b9bdb9..a9db07b78 100644
--- 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 f66b57921..2fc3b38f5 100644
--- 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 b25fd9788..7a6ba5a5e 100644
--- 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 1d2ffde06..acb2cc009 100644
--- 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 eb02b2929..1c403da1b 100644
--- 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 d07577bf2..e71300c92 100644
--- 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 5a6e6caa0..6ab126dd7 100644
--- 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 d9fc822cf..61c264252 100644
--- 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 1fcd94b42..6802d97fd 100644
--- 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 8fd63002e..439e44a83 100644
--- 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 0a93e2c4d..66aa6e439 100755
--- 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 ad0ebe941..7c87864f1 100644
--- 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 3afc05013..fe874c13d 100644
--- 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 4825e3f47..f0de0e92f 100644
--- 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 51e90f1bb..abd9dfb7d 100644
--- 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 4a3725c81..9846a8a25 100644
--- 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	\