Modify Makefiles to have SALOME style link both in Session (full salome) and SUITApp...

diff --git a/src/Makefile.in b/src/Makefile.in
index 0bd6d185f1d6f3dfd9fe5b713084d8decee59c4b..f55c420e760cf224574ad9bcb3b92157a91b103c 100755 (executable)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -32,7 +32,7 @@ VPATH=.:@srcdir@
 
 @COMMENCE@
 
-SUBDIRS = Qtx DDS QDS SUIT STD CAF CAM SUITApp LogWindow ObjBrowser Prs
+SUBDIRS = Qtx Style DDS QDS SUIT STD CAF CAM SUITApp LogWindow ObjBrowser Prs
 
 ifneq ($(DISABLE_SALOMEOBJECT),yes)
   SUBDIRS += OBJECT
@@ -66,7 +66,7 @@ endif
 ifneq ($(DISABLE_SUPERVGRAPHVIEWER),yes)
   SUBDIRS += SUPERVGraph
 endif
-SUBDIRS += LightApp Style ResExporter
+SUBDIRS += LightApp ResExporter
 
 ifneq ($(GUI_DISABLE_CORBA),yes)
   SUBDIRS +=  RegistryDisplay TOOLSGUI \

diff --git a/src/SUITApp/Makefile.in b/src/SUITApp/Makefile.in
index 17601209e658de52045cac501fe9344246b22e32..4166f2312798b694a3d560215849d6238b46055e 100644 (file)
--- a/src/SUITApp/Makefile.in
+++ b/src/SUITApp/Makefile.in
@@ -57,6 +57,18 @@ endif
 LIBS+= -lsuit -lqtx
 LIBSFORBIN+= -lsuit -lqtx
 
+PLUGINDIR = $(top_builddir)/bin/salome/styles
+MYPLUGINDIR = styles
+
+$(MYPLUGINDIR): $(PLUGINDIR)
+       -$(RM) $@
+       ln -sf $< $@
+
+$(PLUGINDIR):
+       mkdir -p $@
+
+bin: $(MYPLUGINDIR)
+
 @CONCLUDE@
 
 

diff --git a/src/Session/Makefile.in b/src/Session/Makefile.in
index a02da34946411e2336150594d7deae190af65832..6910337d07c87cc7901c7e365c077de0bcacf4ea 100755 (executable)
--- a/src/Session/Makefile.in
+++ b/src/Session/Makefile.in
@@ -65,5 +65,17 @@ LDFLAGS += $(QT_MT_LIBS) $(KERNEL_LDFLAGS) -lSalomeNS -lsuit -lSalomeLifeCycleCO
 
 LDFLAGSFORBIN= $(LDFLAGS) $(OMNIORB_LIBS) $(HDF5_LIBS) -lqtx -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry -lSalomeNotification -lSALOMEBasics
 
+PLUGINDIR = $(top_builddir)/bin/salome/styles
+MYPLUGINDIR = styles
+
+$(MYPLUGINDIR): $(PLUGINDIR)
+       -$(RM) $@
+       ln -sf $< $@
+
+$(PLUGINDIR):
+       mkdir -p $@
+
+bin: $(MYPLUGINDIR)
+
 @CONCLUDE@
 

diff --git a/src/Style/Makefile.in b/src/Style/Makefile.in
index 6de6bc78dc9ad82c4ed373b7e26e7a5cdf161d1a..445b89d3a38c1d18856ed5fbccbe11541d0c1394 100644 (file)
--- a/src/Style/Makefile.in
+++ b/src/Style/Makefile.in
@@ -50,16 +50,23 @@ CPPFLAGS+=$(QT_INCLUDES)
 LDFLAGS+=$(QT_MT_LIBS)
 LIBS+=
 
-# create $(top_builddir)/src/Session/styles directory and copy libSalomeStyle.so there
-LIB_PLUGINDIR = $(top_builddir)/src/Session/styles
-LIB_PLUGINLIB = $(patsubst %.la, $(LIB_PLUGINDIR)/%.so, $(filter %.la, $(LIB)))
+# create $(top_builddir)/bin/salome/styles directory and 
+# make link to the libSalomeStyle.so there
+PLUGINDIR = $(top_builddir)/bin/salome/styles
+PLUGIN_LIB_LA = $(patsubst %.la, $(PLUGINDIR)/%.so, $(filter %.la, $(LIB)))
+PLUGIN_LIB_SO = $(patsubst %.so, $(PLUGINDIR)/%.so, $(filter %.so, $(LIB)))
 
-lib: $(LIB) $(LIB_PLUGINDIR) $(LIB_PLUGINLIB)
+lib: $(LIB) $(PLUGINDIR) $(PLUGIN_LIB_LA) $(PLUGIN_LIB_SO)
 
-$(LIB_PLUGINDIR):
+$(PLUGINDIR):
        mkdir -p $@
 
-$(LIB_PLUGINLIB): $(LIB_PLUGINDIR)/%.so: .libs/%.so
+$(PLUGIN_LIB_LA): $(PLUGINDIR)/%.so: %.la
+       -$(RM) $@
+       ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<) $@ || true
+       ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<).0 $@.0 || true
+
+$(PLUGIN_LIB_SO): $(PLUGINDIR)/%.so: %.so
        -$(RM) $@
        ln -sf $(CURDIR)/$< $@ || true