From ac37a45041da3e270a32023fa0de21bfc8777230 Mon Sep 17 00:00:00 2001 From: nri Date: Wed, 9 Jul 2003 17:01:35 +0000 Subject: [PATCH] NRI : Merge from V1_2. --- salome_adm/unix/make_commence.in | 13 ++++--------- salome_adm/unix/make_conclude.in | 32 ++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/salome_adm/unix/make_commence.in b/salome_adm/unix/make_commence.in index dbd46fcbe..628ce5f00 100644 --- a/salome_adm/unix/make_commence.in +++ b/salome_adm/unix/make_commence.in @@ -1,5 +1,5 @@ # common directories to put headerfiles -inc_builddir=$(top_builddir)/include +inc_builddir=$(top_builddir)/include/salome @SET_MAKE@ SHELL=/bin/sh @@ -106,11 +106,6 @@ OCC_VIEWER_LIBS=@CAS_VIEWER@ OCC_MODELER_LIBS=@CAS_MODELER@ OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@ OCC_LIBS=@CAS_LDFLAGS@ -CAS_KERNEL=@CAS_KERNEL@ -CAS_OCAF=@CAS_OCAF@ -CAS_VIEWER=@CAS_VIEWER@ -CAS_MODELER=@CAS_MODELER@ -CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@ # MPICH MPICH_INCLUDES=@MPICH_INCLUDES@ @@ -130,7 +125,7 @@ OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@ OMNIORB_IDL = @OMNIORB_IDL@ OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ -OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/share/salome/idl +OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/idl OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ @@ -190,8 +185,8 @@ LN_S=@LN_S@ ## Installation points prefix=@prefix@ exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ +bindir=@bindir@/salome +libdir=@libdir@/salome # warning : if user give this path in configure we could have salome/salome :-( includedir=@includedir@/salome datadir=@datadir@/salome diff --git a/salome_adm/unix/make_conclude.in b/salome_adm/unix/make_conclude.in index 63ea4a424..b392ab2f0 100644 --- a/salome_adm/unix/make_conclude.in +++ b/salome_adm/unix/make_conclude.in @@ -35,9 +35,9 @@ LIB_OBJ_F = $(patsubst %.f, %.lo, $(filter %.f, $(LIB_SRC))) # all libtool obj file in library LIB_OBJ = $(LIB_OBJ_CXX) $(LIB_OBJ_CC) $(LIB_OBJ_C) $(LIB_CLIENT_OBJ:%.o=%.lo) $(LIB_SERVER_OBJ:%.o=%.lo) $(LIB_SWIG_OBJ) $(LIB_OBJ_F) -# LIB_BUILD = $(LIB:%.la=$(top_builddir)/lib/%.la) -LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib/%.la, $(filter %.la, $(LIB))) -LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib/%.a, $(filter %.a, $(LIB))) +# LIB_BUILD = $(LIB:%.la=$(top_builddir)/lib/salome/%.la) +LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib/salome/%.la, $(filter %.la, $(LIB))) +LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib/salome/%.a, $(filter %.a, $(LIB))) ifneq ($(findstring cmodule.la,$(filter %.la, $(LIB))),) LIB_SWIG = $(patsubst %cmodule.la,%.so, $(filter %.la, $(LIB))) @@ -48,7 +48,7 @@ endif lib: $(LIB_BUILD) $(LIB_CLIENT_PY) # we don't build static library ! -$(LIB_BUILD): $(top_builddir)/lib/%.la: %.la +$(LIB_BUILD): $(top_builddir)/lib/salome/%.la: %.la -$(RM) $@ -$(RM) $(patsubst %.la, %.so, $@) -$(RM) $(patsubst %.la, %.a, $@) @@ -62,7 +62,7 @@ $(LIB_BUILD): $(top_builddir)/lib/%.la: %.la ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib/_$(LIB_SWIG) || true;\ fi; -$(LIB_BUILD_A): $(top_builddir)/lib/%.a: %.a +$(LIB_BUILD_A): $(top_builddir)/lib/salome/%.a: %.a -$(RM) $@ ln -sf $(CURDIR)/$< $@ || true @@ -86,11 +86,11 @@ BIN_OBJ_CXX = $(patsubst %.cxx, %.o, $(filter %.cxx, $(BIN_SRC))) # all obj file in bin target BIN_OBJ = $(BIN_OBJ_CC) $(BIN_OBJ_CXX) $(BIN_OBJ_C) $(BIN_CLIENT_OBJ) $(BIN_SERVER_OBJ) -bin: $(BIN:%=$(top_builddir)/bin/%) $(BIN) $(LIB) pyscripts sharedpyscripts +bin: $(BIN:%=$(top_builddir)/bin/salome/%) $(BIN) $(LIB) pyscripts sharedpyscripts BIN_LIB=$(LIB:lib%.la=-l%) -$(BIN:%=$(top_builddir)/bin/%) $(TEST_PROGS:%=$(top_builddir)/bin/%): $(top_builddir)/bin/%: % +$(BIN:%=$(top_builddir)/bin/salome/%) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%): $(top_builddir)/bin/salome/%: % -$(RM) $@ ln -sf $(CURDIR)/$< $@ @@ -101,7 +101,7 @@ $(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ) # DEST_PYSCRIPTS = $(EXPORT_PYSCRIPTS:%=$(top_builddir)/bin/%) pyscripts: $(DEST_PYSCRIPTS) -$(DEST_PYSCRIPTS): $(top_builddir)/bin/%: % +$(DEST_PYSCRIPTS): $(top_builddir)/bin/salome/%: % cp -f $< $@ # copy pyqt files in $(PYTHON_SHARED_SITE) @@ -120,7 +120,7 @@ check: test tests: test -test: $(LIB) $(TEST_PROGS:%=$(top_builddir)/bin/%) +test: $(LIB) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%) # copy header file in $(inc_builddir) @@ -260,10 +260,10 @@ clean: mostlyclean -$(RM) $(LIB) $(TEST_PROGS) $(BIN) $(CLEAN) -$(RM) TAGS *~ *# core *.core -$(RM) -r .libs - -$(RM) $(top_builddir)/lib/$(LIB) - -$(RM) $(patsubst %,$(top_builddir)/bin/%, $(BIN)) - -$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib/$(LIB)) - -$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib/$(LIB)) + -$(RM) $(top_builddir)/lib/salome/$(LIB) + -$(RM) $(patsubst %,$(top_builddir)/bin/salome/%, $(BIN)) + -$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib/salome/$(LIB)) + -$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib/salome/$(LIB)) # remove idl generated files (sources) -$(RM) $(LIB_CLIENT_SRC) $(LIB_SERVER_SRC) $(BIN_CLIENT_SRC) $(BIN_SERVER_SRC) # remove idl generated files (headers) @@ -327,7 +327,11 @@ distclean: clean $(SWIG) $(SWIG_FLAGS) -o $@ $< $(top_builddir)/share/salome/resources/%.qm: %.po - $(top_builddir)/bin/msg2qm $< $@ + if test -e ${KERNEL_ROOT_DIR}/bin/salome/msg2qm ; then \ + ${KERNEL_ROOT_DIR}/bin/salome/msg2qm $< $@ ; \ + else \ + $(top_builddir)/bin/salome/msg2qm $< $@ ; \ + fi #------------------------------------------------------------------------------ # The following section of this makefile contains dependencies between the -- 2.39.2