components/library/ORBit2/patches/ORBit2-shared_name-server.patch

   1 http://www.sisyphus.ru/ru/srpm/Branch3/ORBit2/patches/0 (modified)
   2 libname-server-2 is used by  libbonobo, so make it shared
   3
   4 --- ORBit2-2.14.19/src/services/name/Makefile.am.~1~    2010-02-09 15:05:35.000000000 +0300
   5 +++ ORBit2-2.14.19/src/services/name/Makefile.am        2014-04-09 15:13:18.846618028 +0400
   6 @@ -6,12 +6,10 @@
   7
   8  libORBitservicesincludedir = $(includedir)/orbit-2.0/ORBitservices
   9
  10 -lib_LTLIBRARIES=libORBitCosNaming-2.la
  11 +lib_LTLIBRARIES=libORBitCosNaming-2.la libname-server-2.la
  12
  13  noinst_PROGRAMS = name-client-2 orbit-name-server-2
  14
  15 -lib_LIBRARIES = libname-server-2.a
  16 -
  17  libORBitCosNaming_2_la_SOURCES =                                       \
  18         CosNaming-common.c                                              \
  19         CosNaming-stubs.c
  20 @@ -26,6 +24,14 @@
  21         $(ORBIT_NAME_LIBS)                                              \
  22         $(top_builddir)/src/orb/libORBit-2.la
  23
  24 +libname_server_2_la_SOURCES = \
  25 +       orbit-name-server.c CosNaming-skels.c \
  26 +       name-support.c name-support.h
  27 +
  28 +libname_server_2_la_DEPENDENCIES = $(DEPS) CosNaming.h
  29 +
  30 +libname_server_2_la_LDFLAGS = -no-undefined
  31 +
  32  INCLUDES =                             \
  33         -I.                             \
  34         -I$(top_builddir)/include       \
  35 @@ -49,7 +55,8 @@
  36  CLEANFILES=my_cosnaming_built $(BUILT_SOURCES)
  37
  38  DEPS =         $(top_builddir)/src/orb/libORBit-2.la                   \
  39 -       libORBitCosNaming-2.la
  40 +       libORBitCosNaming-2.la                                  \
  41 +       libname-server-2.la
  42
  43  LDADDS =                                                        \
  44         $(top_builddir)/src/orb/libORBit-2.la                   \
  45 @@ -57,21 +64,17 @@
  46         $(libm)                                                 \
  47         $(ORBIT_NAME_LIBS)
  48
  49 -name_client_2_SOURCES = name-client.c name-support.c name-support.h
  50 +name_client_2_SOURCES = name-client.c name-support.h
  51  name_client_2_LDFLAGS = $(FLAGS)
  52  name_client_2_DEPENDENCIES = $(DEPS) CosNaming.h
  53 -name_client_2_LDADD = $(LDADDS)
  54 -
  55 -libname_server_2_a_SOURCES = orbit-name-server.c CosNaming-skels.c \
  56 -                          name-support.c name-support.h
  57 -libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h
  58 +name_client_2_LDADD =  libname-server-2.la $(LDADDS)
  59
  60  orbit_name_server_2_SOURCES = boot.c
  61  orbit_name_server_2_LDFLAGS = $(FLAGS)
  62  orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h
  63 -orbit_name_server_2_LDADD = libname-server-2.a $(LDADDS)
  64 +orbit_name_server_2_LDADD = libname-server-2.la $(LDADDS)
  65
  66 -$(libname_server_2_a_OBJECTS) $(name_client_2_OBJECTS) $(orbit_name_server_2_OBJECTS) : CosNaming.h
  67 +$(libname_server_2_la_OBJECTS) $(name_client_2_OBJECTS) $(orbit_name_server_2_OBJECTS) : CosNaming.h
  68
  69  EXTRA_DIST = $(idl_DATA)
  70