ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-24 08:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
vsr 2009-08-13 05:08:19 +00:00
parent 53725279b6
commit 63b2d29eae
27 changed files with 46 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
adm_local/unix/make_common_starter.am
View File

@ -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

41
build_configure
View File

@ -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"

5
configure.ac
View File

@ -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 \

3
idl/Makefile.am
View File

@ -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

3
src/BasicGUI/Makefile.am
View File

@ -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 = \

3
src/BlocksGUI/Makefile.am
View File

@ -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 \

3
src/BooleanGUI/Makefile.am
View File

@ -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

3
src/BuildGUI/Makefile.am
View File

@ -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 \

3
src/DisplayGUI/Makefile.am
View File

@ -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 \

3
src/EntityGUI/Makefile.am
View File

@ -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 \

3
src/GEOM/Makefile.am
View File

@ -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) \

3
src/GEOMBase/Makefile.am
View File

@ -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 \

3
src/GEOMClient/Makefile.am
View File

@ -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 \

3
src/GEOMFiltersSelection/Makefile.am
View File

@ -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) \

3
src/GEOMGUI/Makefile.am
View File

@ -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 \

3
src/GEOMImpl/Makefile.am
View File

@ -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 \

3
src/GEOMToolsGUI/Makefile.am
View File

@ -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 \

3
src/GEOM_I/Makefile.am
View File

@ -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 = \

3
src/GEOM_I_Superv/Makefile.am
View File

@ -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 \

3
src/GEOM_SWIG_WITHIHM/Makefile.am
View File

@ -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 = \

3
src/GenerationGUI/Makefile.am
View File

@ -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 \

3
src/GroupGUI/Makefile.am
View File

@ -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 \

3
src/MeasureGUI/Makefile.am
View File

@ -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 \

3
src/OperationGUI/Makefile.am
View File

@ -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 \

3
src/PrimitiveGUI/Makefile.am
View File

@ -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 \

3
src/RepairGUI/Makefile.am
View File

@ -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

3
src/TransformationGUI/Makefile.am
View File

@ -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 \