Fix for bug PAL9354 (Can't edit a python line).

[modules/kernel.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 52b547b1e438bc9707e1d2a764ae486653b6e8df..1d9104d3a9e527e2448df7305e90e97fbcf6b261 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,18 +9,19 @@
 top_srcdir=@top_srcdir@
 top_builddir=.
 srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
+VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:@top_srcdir@/resources:./bin:@top_srcdir@/idl
 
 
 @COMMENCE@
 
-SUBDIRS = idl src salome_adm
+SUBDIRS = idl src examples doc salome_adm
 
 RESOURCES_FILES = \
 back.xpm \
 cascade.png \
 CatalogDataType.xml \
 KERNELCatalog.xml \
+CatalogResources.xml \
 CatalogRessources.xml \
 close.png \
 config \
@@ -82,7 +83,6 @@ uc_del.png \
 uc_new.png \
 uc_clear.png \
 channel.cfg \
-Plugin \
 SALOMEDS_Resources
 
 BIN_SCRIPT= \
@@ -91,14 +91,31 @@ VERSION \
 orbmodule.py \
 runSalome.py \
 killSalome.py \
+killSalomeWithPort.py \
 runSalome \
-runNS.sh
+runSalome.csh \
+runNS.sh \
+launchConfigureParser.py \
+salome.launch \
+envSalome.py \
+salomeConsole.py \
+showNS.py
 
 # copy header files in common directory
-ifeq ($(HAVE_SSTREAM),yes)
-  include_list=include/salome/SALOMEconfig.h
+OWN_CONFIG_H=@OWN_CONFIG_H@
+
+ifeq ($(OWN_CONFIG_H),yes)
+    ifeq ($(HAVE_SSTREAM),yes)
+       include_list=include/salome/SALOMEconfig.h include/salome/config.h
+    else
+       include_list=include/salome/SALOMEconfig.h include/salome/config.h include/salome/sstream
+    endif
 else
-  include_list=include/salome/SALOMEconfig.h include/salome/sstream
+    ifeq ($(HAVE_SSTREAM),yes)
+       include_list=include/salome/SALOMEconfig.h
+    else
+       include_list=include/salome/SALOMEconfig.h include/salome/sstream
+    endif
 endif
 
 inc: idl $(include_list)
@@ -116,6 +133,10 @@ salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h
          cp -p $< $@;        \
        fi;                   \
 
+include/salome/config.h: salome_adm/unix/config.h
+       -$(RM) $@
+       $(LN_S) ../../$< $@
+
 include/salome/sstream: salome_adm/unix/sstream
        -$(RM) $@
        $(LN_S) ../../$< $@
@@ -153,6 +174,10 @@ install-bin: $(BIN_SCRIPT)
        $(INSTALL) -d  $(bindir)
        $(INSTALL_PROGRAM) $^ $(bindir)
 
+# install Plugin file
+install-plugin: $(top_builddir)/share/salome/resources/Plugin
+       ($(INSTALL_DATA) $^ $(datadir)/resources/. || exit 1); \
+
 uninstall: uninstall-idl
 
 uninstall-idl:
@@ -163,10 +188,14 @@ distclean: distclean-other
 distclean-other:
        -$(RM) salome_adm/unix/*~ salome_adm/unix/*% salome_adm/unix/*.bak salome_adm/unix/*.new salome_adm/unix/*.old
        -$(RM) salome_adm/unix/make_* 
-       -$(RM) salome_adm/unix/depend salome_adm/unix/SALOMEconfig.h 
+       -$(RM) salome_adm/unix/depend salome_adm/unix/SALOMEconfig.h salome_adm/unix/config.h 
        -$(RM) config.cache config.log config.status 
 
 @MODULE@
 
-install: install-bin install-include install-make install-end
+$(top_builddir)/share/salome/resources/Plugin: resources/Plugin
+       cp -f $< $@ ; \
+
+resources: $(top_builddir)/share/salome/resources/Plugin
 
+install: install-bin install-include install-make install-plugin install-end