From: yfr Date: Thu, 17 Jun 2004 09:27:21 +0000 (+0000) Subject: DCQ : Merge with Ecole_ete_a6. X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f8b6c59bf89c6ea0549e8ecf6a0ac392f95b0faa;p=modules%2Fyacs.git DCQ : Merge with Ecole_ete_a6. --- diff --git a/salome_adm/Makefile.in b/salome_adm/Makefile.in index 9a6d45867..cbe47153d 100644 --- a/salome_adm/Makefile.in +++ b/salome_adm/Makefile.in @@ -5,14 +5,15 @@ srcdir=@srcdir@ VPATH=.:$(srcdir)/salome_adm -all: - cp -rf @top_srcdir@/salome_adm @prefix@ +all: resources -install: all +install: + cp -rf @top_srcdir@/salome_adm @prefix@ bin: resources : + cp -rf @top_srcdir@/salome_adm @top_builddir@ inc: diff --git a/salome_adm/unix/depend.in b/salome_adm/unix/depend.in index 4b801243f..09a46645a 100644 --- a/salome_adm/unix/depend.in +++ b/salome_adm/unix/depend.in @@ -20,11 +20,6 @@ ## otherwise the file is changed and a backup is saved by appending a ## tilde to the file name. ## - -DEPCC = @DEPCC@ -DEPCXX = @DEPCXX@ -DEPCXXFLAGS = @DEPCXXFLAGS@ - $(srcdir)/Dependencies: .depend @if test "$(srcdir)" != "."; then \ echo '## This file is machine generated on GNU systems.' >$@; \ @@ -48,7 +43,7 @@ depend:.depend echo Building dependencies for $$dep; \ obj=`basename $$dep .c`.lo; \ sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \ - $(DEPCC) $(C_DEPEND_FLAG) $(CPPFLAGS) $$dep 2>/dev/null | \ + $(CC) $(C_DEPEND_FLAG) $(CPPFLAGS) $$dep 2>/dev/null | \ sed 's% $(srcdir)/% $$(srcdir)/%g' | \ sed 's% $(top_srcdir)/% $$(top_srcdir)/%g' | \ sed 's% $(top_builddir)/% $$(top_builddir)/%g' | \ @@ -58,7 +53,7 @@ depend:.depend echo Building dependencies for $$dep; \ obj=`basename $$dep .cc`.lo; \ sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \ - $(DEPCXX) $(CXX_DEPEND_FLAG) $(DEPCXXFLAGS) $(CPPFLAGS) $$dep 2>/dev/null | \ + $(CXX) $(CXX_DEPEND_FLAG) $(CXXFLAGS) $(CPPFLAGS) $$dep 2>/dev/null | \ sed 's% $(srcdir)/% $$(srcdir)/%g' | \ sed 's% $(top_srcdir)/% $$(top_srcdir)/%g' | \ sed 's% $(top_builddir)/% $$(top_builddir)/%g' | \ @@ -68,7 +63,7 @@ depend:.depend echo Building dependencies for $$dep; \ obj=`basename $$dep .cxx`.lo; \ sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \ - $(DEPCXX) $(CXX_DEPEND_FLAG) $(DEPCXXFLAGS) $(CPPFLAGS) $$dep 2>/dev/null | \ + $(CXX) $(CXX_DEPEND_FLAG) $(CXXFLAGS) $(CPPFLAGS) $$dep 2>/dev/null | \ sed 's% $(srcdir)/% $$(srcdir)/%g' | \ sed 's% $(top_srcdir)/% $$(top_srcdir)/%g' | \ sed 's% $(top_builddir)/% $$(top_builddir)/%g' | \ diff --git a/salome_adm/unix/make_commence.in b/salome_adm/unix/make_commence.in index 0f6b4ac3b..72033bdcd 100644 --- a/salome_adm/unix/make_commence.in +++ b/salome_adm/unix/make_commence.in @@ -2,8 +2,7 @@ inc_builddir=$(top_builddir)/include/salome @SET_MAKE@ -# Modifcation B. Secher portage sur osf -SHELL=@SHELL@ +SHELL=/bin/sh # header missing @@ -11,10 +10,9 @@ HAVE_SSTREAM=@HAVE_SSTREAM@ LIBS=@LIBS@ -# LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome -LDFLAGS= @LDFLAGS@ -L$(top_builddir)/lib/salome +LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome # add libstdc++ to link c++ library with libtool ! -LDFLAGS+= @STDLIB@ +LDFLAGS+= -lstdc++ CP=@CP@ @@ -36,6 +34,10 @@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@ +# BOOST Library + +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ + # JAVA JAVA_INCLUDES = @JAVA_INCLUDES@ @@ -75,7 +77,6 @@ SIP_LIBS = @SIP_LIBS@ # PYQT PYQT_SIPS = @PYQT_SIPS@ -PYQT_INCLUDES = @PYQT_INCLUDES@ PYQT_LIBS = @PYQT_LIBS@ # openGL @@ -115,10 +116,8 @@ CAS_VIEWER=@CAS_VIEWER@ CAS_MODELER=@CAS_MODELER@ CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@ CAS_LDPATH=@CAS_LDPATH@ -# MPI -MPI_INCLUDES=@MPI_INCLUDES@ -MPI_LIBS=@MPI_LIBS@ # MPICH + MPICH_INCLUDES=@MPICH_INCLUDES@ MPICH_LIBS=@MPICH_LIBS@ @@ -136,7 +135,7 @@ OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@ OMNIORB_IDL = @OMNIORB_IDL@ OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ -OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/idl +OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/salome/idl OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ @@ -153,7 +152,7 @@ CORBA_INCLUDES = @CORBA_INCLUDES@ CORBA_LIBS = @CORBA_LIBS@ CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ -IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/idl +IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/salome/idl IDLPYFLAGS = @IDLPYFLAGS@ IDL = @IDL@ @@ -207,13 +206,13 @@ idldir=${prefix}/idl/salome sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules incmakedir=${prefix}/salome_adm/unix -docdir=$(datadir)/doc +docdir=${prefix}/doc/salome # # begin of package rules # -.PHONY: all lib bin inc resources data doc tests install uninstall dep depend depend_idl cleandep mostlyclean clean distclean +.PHONY: all lib bin inc resources data docs tests install uninstall dep depend depend_idl cleandep mostlyclean clean distclean .SUFFIXES: .cxx .cc .c .f .o .lo .idl .py .i .ui .po .qm @@ -256,7 +255,7 @@ ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \ ac_cxx_partial_specialization.m4 check_opengl.m4 python.m4 \ ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ ac_cc_warnings.m4 check_qt.m4 check_med2.m4 \ -check_swig.m4 +check_swig.m4 check_boost.m4 $(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files diff --git a/salome_adm/unix/make_conclude.in b/salome_adm/unix/make_conclude.in index cc2fb2be6..b791f484d 100644 --- a/salome_adm/unix/make_conclude.in +++ b/salome_adm/unix/make_conclude.in @@ -95,7 +95,7 @@ $(BIN:%=$(top_builddir)/bin/salome/%) $(TEST_PROGS:%=$(top_builddir)/bin/salome/ ln -sf $(CURDIR)/$< $@ $(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGS) $(LIBS) + $(CXX) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGS) $(LIBS) # copy python scripts in $(top_builddir)/bin/salome # @@ -161,7 +161,7 @@ install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir # Install exported includes in includedir @for f in X $(EXPORT_HEADERS:%=$(srcdir)/%); do \ if test $$f != X; then \ - (cp -p $$f $(includedir) || exit 1); \ + (cp -p -f $$f $(includedir) || exit 1); \ fi; \ done diff --git a/salome_adm/unix/make_module.in b/salome_adm/unix/make_module.in index 983342227..2d08f49ba 100644 --- a/salome_adm/unix/make_module.in +++ b/salome_adm/unix/make_module.in @@ -57,11 +57,11 @@ data: @if test "X$(top_builddir)" = "X."; then \ ((cd examples && $(MAKE) $@) || exit 1); \ fi; - -doc: - @if test "X$(top_builddir)" = "X."; then \ - ((cd doc && $(MAKE) $@) || exit 1); \ - fi; +# Commented because we need not to make docs when we make BUILD +# docs: +# @if test "X$(top_builddir)" = "X."; then \ +# ((cd doc && $(MAKE) $@) || exit 1); \ +# fi; install: install-resources @@SETX@; for d in $(SUBDIRS); do \