diff --git a/cde/lib/DtHelp/Makefile.am b/cde/lib/DtHelp/Makefile.am index 9b88a4e97..8aad06f3f 100644 --- a/cde/lib/DtHelp/Makefile.am +++ b/cde/lib/DtHelp/Makefile.am @@ -40,4 +40,9 @@ libDtHelp_la_SOURCES = Actions.c AsciiSpc.c Callbacks.c \ Layout.c LayoutUtil.c LinkMgr.c \ Selection.c VirtFuncs.c +# in order to try to keep lib versions the same across platforms, (2.1.0) +if BSD +libDtHelp_la_LDFLAGS = -version-info 2:1:0 +else libDtHelp_la_LDFLAGS = -version-info 3:0:1 +endif diff --git a/cde/lib/DtMrm/Makefile.am b/cde/lib/DtMrm/Makefile.am index a1e24dc80..3836d414b 100644 --- a/cde/lib/DtMrm/Makefile.am +++ b/cde/lib/DtMrm/Makefile.am @@ -7,4 +7,10 @@ libDtMrm_la_CFLAGS = -I../DtTerm/Term -I../DtTerm/TermPrim -I../DtHelp \ libDtMrm_la_SOURCES = DtMrm.c +# in order to try to keep lib versions the same across platforms, (2.1.0) +if BSD +libDtMrm_la_LDFLAGS = -version-info 2:1:0 +else libDtMrm_la_LDFLAGS = -version-info 3:0:1 +endif + diff --git a/cde/lib/DtPamSvc/Makefile.am b/cde/lib/DtPamSvc/Makefile.am index 932addb68..7c21e8d8f 100644 --- a/cde/lib/DtPamSvc/Makefile.am +++ b/cde/lib/DtPamSvc/Makefile.am @@ -7,5 +7,11 @@ libDtPamSvc_la_SOURCES = PamSvc.c ${top_srcdir}/include/Dt/PamSvc.h libDtPamSvc_la_LIBADD = -lpam +# in order to try to keep lib versions the same across platforms, (2.1.0) +if BSD +libDtPamSvc_la_LDFLAGS = -version-info 2:1:0 +else libDtPamSvc_la_LDFLAGS = -version-info 3:0:1 +endif + diff --git a/cde/lib/DtPrint/Makefile.am b/cde/lib/DtPrint/Makefile.am index fc235965c..4c57e5573 100644 --- a/cde/lib/DtPrint/Makefile.am +++ b/cde/lib/DtPrint/Makefile.am @@ -3,7 +3,14 @@ MAINTAINERCLEANFILES = Makefile.in lib_LTLIBRARIES = libDtPrint.la libDtPrint_la_CFLAGS = -DMULTIBYTE -DI18N_MSG @DT_INCDIR@ + +# in order to try to keep lib versions the same across platforms, (2.1.0) +if BSD +libDtPrint_la_LDFLAGS = -version-info 2:1:0 +else libDtPrint_la_LDFLAGS = -version-info 3:0:1 +endif + if SOLARIS libDtPrint_la_CFLAGS += -DNO_REGCOMP diff --git a/cde/lib/DtSearch/Makefile.am b/cde/lib/DtSearch/Makefile.am index cf4420072..fce13b0b6 100644 --- a/cde/lib/DtSearch/Makefile.am +++ b/cde/lib/DtSearch/Makefile.am @@ -12,7 +12,13 @@ libDtSearch_la_CFLAGS = -DI18N_MSG -DMULTIBYTE -I./raima \ $(DT_INCDIR) +# in order to try to keep lib versions the same across platforms, (2.1.0) +if BSD +libDtSearch_la_LDFLAGS = -version-info 2:1:0 +else libDtSearch_la_LDFLAGS = -version-info 3:0:1 +endif + libDtSearch_la_LIBADD = raima/libraima.la if SOLARIS diff --git a/cde/lib/DtSvc/Makefile.am b/cde/lib/DtSvc/Makefile.am index e7b6491f8..273048f26 100644 --- a/cde/lib/DtSvc/Makefile.am +++ b/cde/lib/DtSvc/Makefile.am @@ -2,7 +2,13 @@ MAINTAINERCLEANFILES = Makefile.in lib_LTLIBRARIES = libDtSvc.la +# in order to try to keep lib versions the same across platforms, (2.1.0) +if BSD +libDtSvc_la_LDFLAGS = -version-info 2:1:0 +else libDtSvc_la_LDFLAGS = -version-info 3:0:1 +endif + # USe CPPFLAGS so it will apply to both C and C++ components libDtSvc_la_CPPFLAGS = -I./include -DMULTIBYTE -DNLS16 -I../include \ diff --git a/cde/lib/DtTerm/Makefile.am b/cde/lib/DtTerm/Makefile.am index 053b071ca..7b96f2127 100644 --- a/cde/lib/DtTerm/Makefile.am +++ b/cde/lib/DtTerm/Makefile.am @@ -25,4 +25,10 @@ if HAS_UTEMPTER_LIBRARY libDtTerm_la_LIBADD += -lutempter endif +# in order to try to keep lib versions the same across platforms, (2.1.0) +if BSD +libDtTerm_la_LDFLAGS = -version-info 2:1:0 +else libDtTerm_la_LDFLAGS = -version-info 3:0:1 +endif + diff --git a/cde/lib/DtWidget/Makefile.am b/cde/lib/DtWidget/Makefile.am index 578f0a988..182717e2e 100644 --- a/cde/lib/DtWidget/Makefile.am +++ b/cde/lib/DtWidget/Makefile.am @@ -8,7 +8,12 @@ AM_CPPFLAGS = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) $(DT_INCDIR) libDtWidget_la_CFLAGS = -DI18N_MSG -DMULTIBYTE +# in order to try to keep lib versions the same across platforms, (2.1.0) +if BSD +libDtWidget_la_LDFLAGS = -version-info 2:1:0 +else libDtWidget_la_LDFLAGS = -version-info 3:0:1 +endif if SOLARIS libDtWidget_la_CFLAGS += -DNO_REGCOMP diff --git a/cde/lib/DtXinerama/Makefile.am b/cde/lib/DtXinerama/Makefile.am index 3eb7d587b..3844159d6 100644 --- a/cde/lib/DtXinerama/Makefile.am +++ b/cde/lib/DtXinerama/Makefile.am @@ -5,5 +5,12 @@ lib_LTLIBRARIES = libDtXinerama.la libDtXinerama_la_SOURCES = DtXinerama.c libDtXinerama_la_LIBADD = -lXinerama -libDtXinerama_la_LDFLAGS = -version-info 3:0:1 + +# in order to try to keep lib versions the same across platforms, (2.1.0) +if BSD +libDtXinerama_la_LDFLAGS = -version-info 2:1:0 +else +libDtXinerama_la_LDFLAGS = -version-info 3:0:1 +endif + diff --git a/cde/lib/csa/Makefile.am b/cde/lib/csa/Makefile.am index 893a8b38b..b0362d32d 100644 --- a/cde/lib/csa/Makefile.am +++ b/cde/lib/csa/Makefile.am @@ -9,7 +9,12 @@ libcsa_la_CFLAGS = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N \ libcsa_la_LIBADD = $(XTOOLLIB) $(TIRPCLIB) +# in order to try to keep lib versions the same across platforms, (2.1.0) +if BSD +libcsa_la_LDFLAGS = -version-info 2:1:0 +else libcsa_la_LDFLAGS = -version-info 3:0:1 +endif if LINUX else diff --git a/cde/lib/tt/lib/Makefile.am b/cde/lib/tt/lib/Makefile.am index 0629e2d27..895861805 100644 --- a/cde/lib/tt/lib/Makefile.am +++ b/cde/lib/tt/lib/Makefile.am @@ -25,4 +25,10 @@ if LINUX libtt_la_LIBADD += $(TIRPCLIB) endif +# in order to try to keep lib versions the same across platforms, (2.1.0) +if BSD +libtt_la_LDFLAGS = -version-info 2:1:0 +else libtt_la_LDFLAGS = -version-info 3:0:1 +endif + diff --git a/cde/programs/dtinfo/DtMmdb/Makefile.am b/cde/programs/dtinfo/DtMmdb/Makefile.am index bc2705ce1..ebed81065 100644 --- a/cde/programs/dtinfo/DtMmdb/Makefile.am +++ b/cde/programs/dtinfo/DtMmdb/Makefile.am @@ -26,7 +26,12 @@ libDtMmdb_la_LIBADD = api/libapi.la btree/libbtree.la \ schema/libschema.la storage/libstorage.la \ utility/libutility.la +# in order to try to keep lib versions the same across platforms, (2.1.0) +if BSD +libDtMmdb_la_LDFLAGS = -version-info 2:1:0 +else libDtMmdb_la_LDFLAGS = -version-info 3:0:1 +endif infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc dist_infolib_DATA = oliasdb/mmdb.infolib.spec \