[X2Go-Commits] [libx2goclient] 70/132: src/{, test/}Makefile.am: rename library file back to unversioned variant.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository libx2goclient.

commit 09413dd631bed399a15de251a08ac94cf98e0cb3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat May 29 07:20:10 2021 +0200

    src/{,test/}Makefile.am: rename library file back to unversioned variant.
    
    We probably will never want to have multiple versions co-installable and
    on UNIX-based operating systems, the libtool version will define the
    soversion, which is also directly visible in the file name.
    
    On non-UNIX systems, like Windows, things are a bit different, and we
    probably WILL want the resulting binaries to include some version
    number, but we can also comfortably do that at install time there.
---
 src/Makefile.am      | 14 +++++++++-----
 src/test/Makefile.am |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 6bec2a7..e4f0794 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,11 @@ LDADD = \
 	@LTLIBINTL@ \
 	$(NULL)
 
-lib_LTLIBRARIES = libx2goclient- at LIBX2GOCLIENT_MAJOR_VERSION@.0.la
+# For Windows, we'll want to rename the libraries into something like
+# libx2goclient- at LIBX2GOCLIENT_MAJOR_VERSION@.0.la (and other respective
+# files), but we should be able to do so at install time, so don't
+# overcomplicate things at build time.
+lib_LTLIBRARIES = libx2goclient.la
 
 CLEANFILES =
 DISTCLEANFILES =
@@ -42,7 +46,7 @@ libx2goclientinclude_HEADERS = \
 	x2goclient-utils.h \
 	$(NULL)
 
-libx2goclient_ at LIBX2GOCLIENT_MAJOR_VERSION@_0_la_SOURCES = \
+libx2goclient_la_SOURCES = \
 	x2goclient-agent-start-kdrive.c \
 	x2goclient-agent-start-nx.c \
 	x2goclient-network.c \
@@ -59,15 +63,15 @@ libx2goclient_ at LIBX2GOCLIENT_MAJOR_VERSION@_0_la_SOURCES = \
 	x2goclient-utils.c \
 	$(NULL)
 
-libx2goclient_ at LIBX2GOCLIENT_MAJOR_VERSION@_0_la_CFLAGS = \
+libx2goclient_la_CFLAGS = \
 	$(LIBX2GOCLIENT_CFLAGS) \
 	$(NULL)
 
-libx2goclient_ at LIBX2GOCLIENT_MAJOR_VERSION@_0_la_LIBADD = \
+libx2goclient_la_LIBADD = \
 	$(LIBX2GOCLIENT_LIBS) \
 	$(NULL)
 
-libx2goclient_ at LIBX2GOCLIENT_MAJOR_VERSION@_0_la_LDFLAGS = \
+libx2goclient_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-export-dynamic $(no_undefined) \
 	$(NULL)
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index d059e04..8240b15 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -15,5 +15,5 @@ sshtest_CFLAGS = \
 	$(NULL)
 
 sshtest_LDADD = \
-	../libx2goclient- at LIBX2GOCLIENT_MAJOR_VERSION@.0.la \
+	../libx2goclient.la \
 	$(NULL)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git