NRI : Merge from V1_2.

[modules/kernel.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c29f8b11d08f977d6e40700c8c95767acbfe25ea..52b547b1e438bc9707e1d2a764ae486653b6e8df 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,7 +20,7 @@ RESOURCES_FILES = \
 back.xpm \
 cascade.png \
 CatalogDataType.xml \
-CatalogModuleGeneral.xml \
+KERNELCatalog.xml \
 CatalogRessources.xml \
 close.png \
 config \
@@ -83,39 +83,16 @@ uc_new.png \
 uc_clear.png \
 channel.cfg \
 Plugin \
-Resources \
 SALOMEDS_Resources
 
 BIN_SCRIPT= \
-README \
-allkill \
-allkillWithPort \
-insertComputerRessourcesCatalog.sh \
-runClientDataTypeCatalog \
-runClientModuleCatalog \
-runClientRessourcesCatalog \
-runDataTypeCatalog \
-runModuleCatalog \
-runNS.sh \
-runNSWithPort.sh \
-runRessourcesCatalog \
-runSALOMEDS_Client \
-runSalome \
 runIDLparser \
-runSalomeWithPort \
-runSalomeServers \
-runSalomeDesktop \
-runSession \
-runLoader \
-runTestContainer \
-runTestContainerPy2 \
-runTestContainerPy \
-runTestLifeCycle \
-runTestMED \
-runTestNotification \
-showNS \
-VERSION
-#SuperVision.py
+VERSION \
+orbmodule.py \
+runSalome.py \
+killSalome.py \
+runSalome \
+runNS.sh
 
 # copy header files in common directory
 ifeq ($(HAVE_SSTREAM),yes)
@@ -126,10 +103,19 @@ endif
 
 inc: idl $(include_list)
 
-include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.h
+include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref
        -$(RM) $@
        $(LN_S) ../../$< $@
 
+# test if SALOMEconfig.h has changed (contents)
+salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h
+       @if ! [ -a $@ ]; then \
+         cp -p $< $@;        \
+       fi;                   \
+       if ! cmp $< $@; then  \
+         cp -p $< $@;        \
+       fi;                   \
+
 include/salome/sstream: salome_adm/unix/sstream
        -$(RM) $@
        $(LN_S) ../../$< $@
@@ -143,6 +129,13 @@ depend_idl:
 #doc:
 #      (cd doc && $(MAKE) $@) || exit 1
 
+# Install make_commence make_conclude ... for other modules
+install-make:
+       ($(INSTALL) -d  $(incmakedir) || exit 1);
+       (sed 's/^prefix=/#prefix=/' $(top_builddir)/salome_adm/unix/make_commence > $(incmakedir)/make_commence || exit 1);
+       (sed 's/^prefix=/#prefix=/' $(top_builddir)/salome_adm/unix/make_conclude > $(incmakedir)/make_conclude || exit 1);
+
+
 install-end:
 # finish libtool install
 #      @$(LT) --mode=finish $(libdir)
@@ -151,7 +144,7 @@ install-include: $(include_list)
        $(INSTALL) -d  $(includedir)
        @for f in X $(include_list); do                         \
           if test $$f != X; then                               \
-            ($(INSTALL_DATA) $$f $(includedir)/. || exit 1);   \
+            (cp -p $$f $(includedir) || exit 1);               \
           fi;                                                  \
        done
 
@@ -175,5 +168,5 @@ distclean-other:
 
 @MODULE@
 
-install: install-bin install-include install-end
+install: install-bin install-include install-make install-end