From: asv Date: Thu, 16 Jun 2005 12:02:01 +0000 (+0000) Subject: Create lib file in /bin/styles in 'build' and 'install' versions. Bugs are fixed. X-Git-Tag: T3_0_0_a4~106 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=23e3bf53db84862b88dae767e1d8b5a303e9b494;p=modules%2Fgui.git Create lib file in /bin/styles in 'build' and 'install' versions. Bugs are fixed. --- diff --git a/src/Style/Makefile.in b/src/Style/Makefile.in index 34e62a524..cd086301c 100644 --- a/src/Style/Makefile.in +++ b/src/Style/Makefile.in @@ -36,25 +36,26 @@ LIBS+= LIB_PLUGINDIR = $(top_builddir)/bin/salome/styles LIB_PLUGINLIB = $(patsubst %.la, $(LIB_PLUGINDIR)/%.so, $(filter %.la, $(LIB))) -lib: $(LIB_PLUGINDIR) $(LIB_PLUGINLIB) +lib: $(LIB) $(LIB_PLUGINDIR) $(LIB_PLUGINLIB) $(LIB_PLUGINDIR): mkdir -p $@ -$(LIB_PLUGINLIB): - cp $(patsubst %.la, $(top_builddir)/lib/salome/%.so, $(filter %.la, $(LIB))) $@ +$(LIB_PLUGINLIB): $(top_builddir)/bin/salome/styles/%.so: .libs/%.so + -$(RM) $@ + ln -sf $(CURDIR)/$< $@ || true # do the same in install step INSTALL_PLUGINDIR = $(bindir)/styles -INSTALL_PLUGINLIB = $(patsubst %.la, $(INSTALL_PLUGINDIR)/%.so, $(filter %.la, $(LIB))) +INSTALL_COPYLIB = $(patsubst %.la, $(INSTALL_PLUGINDIR)/%.so, $(filter %.la, $(LIB))) -install: $(INSTALL_PLUGINDIR) $(INSTALL_PLUGINLIB) +install: $(INSTALL_PLUGINDIR) $(INSTALL_COPYLIB) $(INSTALL_PLUGINDIR): mkdir -p $@ -$(INSTALL_PLUGINLIB): - cp $(patsubst %.la, $(libdir)/%.so, $(filter %.la, $(LIB))) $@ +$(INSTALL_COPYLIB): + ln -sf $(patsubst %.la, $(libdir)/%.so, $(filter %.la, $(LIB))) $@ || true @CONCLUDE@