nxcomp{,ext,shad}: use the correct library naming scheme on OS X. It differs from other UNIX-based systems.

4 files changed, 45 insertions, 19 deletions

diff --git a/debian/changelog b/debian/changelog
index 771139d9a..197b257a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low
   [ Clemens Lang ]
   * Use path discovery for finding makedepend. Remove old cruft.
   * Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle.
+  * Use the correct library naming scheme on OS X. It differs from other
+    UNIX-based systems.
 
  -- X2Go Release Manager <git-admin@x2go.org>  Sun, 15 Mar 2015 00:48:06 +0100
 
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index 93bb0b38c..2234474ec 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -91,9 +91,17 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3
 LIBRARY = Xcomp
 
 LIBNAME    = lib$(LIBRARY)
+ifeq ($(shell uname),Darwin)
+LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
+LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
+LIBSHARED  = lib$(LIBRARY).dylib
+LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
+else
 LIBFULL    = lib$(LIBRARY).so.$(VERSION)
 LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)
 LIBSHARED  = lib$(LIBRARY).so
+LIBFLAGS   =
+endif
 LIBARCHIVE = lib$(LIBRARY).a
 
 LIBCYGSHARED  = cyg$(LIBRARY).dll
@@ -232,7 +240,7 @@ COBJ   = $(CSRC:.c=.o)
 CXXOBJ = $(CXXSRC:.cpp=.o)
 
 $(LIBFULL):	 $(CXXOBJ) $(COBJ)
-		 $(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
+		 $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
 
 $(LIBLOAD):	 $(LIBFULL)
 		 rm -f $(LIBLOAD)
@@ -278,9 +286,9 @@ install.lib: all
 	./mkinstalldirs $(DESTDIR)${libdir}
 	./mkinstalldirs $(DESTDIR)${includedir}/nx
 	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
-	$(INSTALL_LINK) libXcomp.so.3           $(DESTDIR)${libdir}
-	$(INSTALL_LINK) libXcomp.so             $(DESTDIR)${libdir}
-	$(INSTALL_DATA) libXcomp.a              $(DESTDIR)${libdir}
+	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
+	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
+	$(INSTALL_DATA) $(LIBARCHIVE)           $(DESTDIR)${libdir}
 	$(INSTALL_DATA) NX*.h                   $(DESTDIR)${includedir}/nx
 	$(INSTALL_DATA) MD5.h                   $(DESTDIR)${includedir}/nx
 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
@@ -293,9 +301,9 @@ uninstall.bin:
 
 uninstall.lib:
 	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
-	$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3
-	$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so
-	$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE)
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index 7987c7563..8777ceeed 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -82,9 +82,17 @@ DEPENDINCLUDES =  -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3
 LIBRARY = Xcompext
 
 LIBNAME    = lib$(LIBRARY)
+ifeq ($(shell uname),Darwin)
+LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
+LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
+LIBSHARED  = lib$(LIBRARY).dylib
+LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
+else
 LIBFULL    = lib$(LIBRARY).so.$(VERSION)
 LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)
 LIBSHARED  = lib$(LIBRARY).so
+LIBFLAGS   =
+endif
 LIBARCHIVE = lib$(LIBRARY).a
 
 LIBCYGSHARED  = cyg$(LIBRARY).dll
@@ -113,7 +121,7 @@ COBJ   = $(CSRC:.c=.o)
 CXXOBJ = $(CXXSRC:.cpp=.o)
 
 $(LIBFULL):	 $(CXXOBJ) $(COBJ)
-		 $(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
+		 $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
 
 $(LIBLOAD):	 $(LIBFULL)
 		 rm -f $(LIBLOAD)
@@ -159,8 +167,8 @@ install.lib: all
 	./mkinstalldirs $(DESTDIR)${libdir}
 	./mkinstalldirs $(DESTDIR)${includedir}/nx
 	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
-	$(INSTALL_LINK) libXcompext.so.3	$(DESTDIR)${libdir}
-	$(INSTALL_LINK) libXcompext.so          $(DESTDIR)${libdir}
+	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
+	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
 	$(INSTALL_DATA) NX*.h                   $(DESTDIR)${includedir}/nx
 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
@@ -172,8 +180,8 @@ uninstall.bin:
 
 uninstall.lib:
 	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
-	$(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so.3
-	$(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h
 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index f7e89a6f2..2f6e50bf9 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -103,9 +103,17 @@ DEPENDINCLUDES = -I/usr/include/g++ -I/usr/include/g++-3
 LIBRARY = Xcompshad
 
 LIBNAME    = lib$(LIBRARY)
+ifeq ($(shell uname),Darwin)
+LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
+LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
+LIBSHARED  = lib$(LIBRARY).dylib
+LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
+else
 LIBFULL    = lib$(LIBRARY).so.$(VERSION)
 LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)
 LIBSHARED  = lib$(LIBRARY).so
+LIBFLAGS   =
+endif
 LIBARCHIVE = lib$(LIBRARY).a
 
 MSRC   = Main.c
@@ -146,7 +154,7 @@ all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE)
 endif
 
 $(LIBFULL):	$(CXXOBJ) $(COBJ)
-		$(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(EXTRALIBS)
+		$(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(EXTRALIBS)
 
 $(LIBLOAD):	$(LIBFULL)
 		rm -f $(LIBLOAD)
@@ -193,9 +201,9 @@ install.lib: all
 	$(INSTALL_DIR)                          $(DESTDIR)${libdir}
 	$(INSTALL_DIR)                          $(DESTDIR)${includedir}/nx
 	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
-	$(INSTALL_LINK) libXcompshad.so.3       $(DESTDIR)${libdir}
-	$(INSTALL_LINK) libXcompshad.so         $(DESTDIR)${libdir}
-	$(INSTALL_DATA) *.a                     $(DESTDIR)${libdir}
+	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
+	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
+	$(INSTALL_DATA) $(LIBARCHIVE)           $(DESTDIR)${libdir}
 	$(INSTALL_DATA) *.h                     $(DESTDIR)${includedir}/nx
 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
@@ -207,9 +215,9 @@ uninstall.bin:
 
 uninstall.lib:
 	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
-	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so.3
-	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so
-	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.a
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE)
 	for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done
 	$(RM_DIR) $(DESTDIR)${libdir}/nx/
 	$(RM_DIR) $(DESTDIR)${includedir}/nx/