Salome HOME
projects
/
modules
/
yacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ac2ad99
)
DCQ : Merge with Ecole_ete_a6.
author
yfr
<yfr@opencascade.com>
Thu, 17 Jun 2004 09:27:21 +0000
(09:27 +0000)
committer
yfr
<yfr@opencascade.com>
Thu, 17 Jun 2004 09:27:21 +0000
(09:27 +0000)
salome_adm/Makefile.in
patch
|
blob
|
history
salome_adm/unix/depend.in
patch
|
blob
|
history
salome_adm/unix/make_commence.in
patch
|
blob
|
history
salome_adm/unix/make_conclude.in
patch
|
blob
|
history
salome_adm/unix/make_module.in
patch
|
blob
|
history
diff --git
a/salome_adm/Makefile.in
b/salome_adm/Makefile.in
index 9a6d45867c1b9d058001ec57e5f638c4cd8e3e4e..cbe47153deaff92c0697fa2a23e53066949410ac 100644
(file)
--- a/
salome_adm/Makefile.in
+++ b/
salome_adm/Makefile.in
@@
-5,14
+5,15
@@
srcdir=@srcdir@
VPATH=.:$(srcdir)/salome_adm
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 :
bin:
resources :
+ cp -rf @top_srcdir@/salome_adm @top_builddir@
inc:
inc:
diff --git
a/salome_adm/unix/depend.in
b/salome_adm/unix/depend.in
index 4b801243f381f64c4eb95787e3a6e1c1e4743352..09a46645aa9c0dafd232ff6fbe35c95e1004a1a3 100644
(file)
--- 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.
##
## 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.' >$@; \
$(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 $@- $@; \
echo Building dependencies for $$dep; \
obj=`basename $$dep .c`.lo; \
sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \
- $(
DEP
CC) $(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' | \
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 $@- $@; \
echo Building dependencies for $$dep; \
obj=`basename $$dep .cc`.lo; \
sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \
- $(
DEPCXX) $(CXX_DEPEND_FLAG) $(DEP
CXXFLAGS) $(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' | \
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 $@- $@; \
echo Building dependencies for $$dep; \
obj=`basename $$dep .cxx`.lo; \
sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \
- $(
DEPCXX) $(CXX_DEPEND_FLAG) $(DEP
CXXFLAGS) $(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' | \
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 0f6b4ac3b3bbc958fcfda9f0fd5345034a7e2f76..72033bdcd7dd38181d5b963ba5013099e98d65f1 100644
(file)
--- 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@
inc_builddir=$(top_builddir)/include/salome
@SET_MAKE@
-# Modifcation B. Secher portage sur osf
-SHELL=@SHELL@
+SHELL=/bin/sh
# header missing
# header missing
@@
-11,10
+10,9
@@
HAVE_SSTREAM=@HAVE_SSTREAM@
LIBS=@LIBS@
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 !
# add libstdc++ to link c++ library with libtool !
-LDFLAGS+=
@STDLIB@
+LDFLAGS+=
-lstdc++
CP=@CP@
CP=@CP@
@@
-36,6
+34,10
@@
CXX = @CXX@
CXXFLAGS = @CXXFLAGS@
CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
CXXFLAGS = @CXXFLAGS@
CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
+# BOOST Library
+
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+
# JAVA
JAVA_INCLUDES = @JAVA_INCLUDES@
# JAVA
JAVA_INCLUDES = @JAVA_INCLUDES@
@@
-75,7
+77,6
@@
SIP_LIBS = @SIP_LIBS@
# PYQT
PYQT_SIPS = @PYQT_SIPS@
# PYQT
PYQT_SIPS = @PYQT_SIPS@
-PYQT_INCLUDES = @PYQT_INCLUDES@
PYQT_LIBS = @PYQT_LIBS@
# openGL
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@
CAS_MODELER=@CAS_MODELER@
CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@
CAS_LDPATH=@CAS_LDPATH@
-# MPI
-MPI_INCLUDES=@MPI_INCLUDES@
-MPI_LIBS=@MPI_LIBS@
# MPICH
# MPICH
+
MPICH_INCLUDES=@MPICH_INCLUDES@
MPICH_LIBS=@MPICH_LIBS@
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_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@
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@
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@
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
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
#
#
# 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 doc
s
tests install uninstall dep depend depend_idl cleandep mostlyclean clean distclean
.SUFFIXES: .cxx .cc .c .f .o .lo .idl .py .i .ui .po .qm
.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 \
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
$(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 cc2fb2be665a63113cb4baea8b4b8f0d193d71ba..b791f484d28cbc6af3e46c0752c957c7cc341270 100644
(file)
--- 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)
ln -sf $(CURDIR)/$< $@
$(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ)
- $(CXX) $(C
PPFLAGS) $(C
XXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGS) $(LIBS)
+ $(CXX) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGS) $(LIBS)
# copy python scripts in $(top_builddir)/bin/salome
#
# 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 \
# 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
fi; \
done
diff --git
a/salome_adm/unix/make_module.in
b/salome_adm/unix/make_module.in
index 983342227ad73788a60c080761f672e3a8219248..2d08f49bad01dab3aadeb91983b0dc88cdc0f814 100644
(file)
--- 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;
@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 \
install: install-resources
@@SETX@; for d in $(SUBDIRS); do \