Skip to content

N
nx-libs
Commit 638e31c2 authored by Clemens Lang's avatar Clemens Lang Committed by Mihai Moldovan
Browse files
Options

nxcomp{,ext,shad}: use the correct library naming scheme on OS X. It differs…

nxcomp{,ext,shad}: use the correct library naming scheme on OS X. It differs from other UNIX-based systems.
parent ad7e12ed
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 19 deletions
debian/changelog
View file @ 638e31c2
...@@ -15,6 +15,8 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low ...@@ -15,6 +15,8 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low
[ Clemens Lang ] [ Clemens Lang ]
* Use path discovery for finding makedepend. Remove old cruft. * Use path discovery for finding makedepend. Remove old cruft.
* Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. * 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 -- X2Go Release Manager <git-admin@x2go.org> Sun, 15 Mar 2015 00:48:06 +0100
......
nxcomp/Makefile.in
View file @ 638e31c2
...@@ -91,9 +91,17 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3 ...@@ -91,9 +91,17 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3
LIBRARY = Xcomp LIBRARY = Xcomp
LIBNAME = lib$(LIBRARY) 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) LIBFULL = lib$(LIBRARY).so.$(VERSION)
LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION) LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION)
LIBSHARED = lib$(LIBRARY).so LIBSHARED = lib$(LIBRARY).so
LIBFLAGS =
endif
LIBARCHIVE = lib$(LIBRARY).a LIBARCHIVE = lib$(LIBRARY).a
LIBCYGSHARED = cyg$(LIBRARY).dll LIBCYGSHARED = cyg$(LIBRARY).dll
...@@ -232,7 +240,7 @@ COBJ = $(CSRC:.c=.o) ...@@ -232,7 +240,7 @@ COBJ = $(CSRC:.c=.o)
CXXOBJ = $(CXXSRC:.cpp=.o) CXXOBJ = $(CXXSRC:.cpp=.o)
$(LIBFULL): $(CXXOBJ) $(COBJ) $(LIBFULL): $(CXXOBJ) $(COBJ)
$(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
$(LIBLOAD): $(LIBFULL) $(LIBLOAD): $(LIBFULL)
rm -f $(LIBLOAD) rm -f $(LIBLOAD)
...@@ -278,9 +286,9 @@ install.lib: all ...@@ -278,9 +286,9 @@ install.lib: all
./mkinstalldirs $(DESTDIR)${libdir} ./mkinstalldirs $(DESTDIR)${libdir}
./mkinstalldirs $(DESTDIR)${includedir}/nx ./mkinstalldirs $(DESTDIR)${includedir}/nx
$(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
$(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir}
$(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir}
$(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir} $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir}
$(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
$(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx
echo "Running ldconfig tool, this may take a while..." && ldconfig || true echo "Running ldconfig tool, this may take a while..." && ldconfig || true
...@@ -293,9 +301,9 @@ uninstall.bin: ...@@ -293,9 +301,9 @@ uninstall.bin:
uninstall.lib: uninstall.lib:
$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL) $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3 $(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so $(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a $(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE)
$(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
$(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
$(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h
......
nxcompext/Makefile.in
View file @ 638e31c2
...@@ -82,9 +82,17 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3 ...@@ -82,9 +82,17 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3
LIBRARY = Xcompext LIBRARY = Xcompext
LIBNAME = lib$(LIBRARY) 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) LIBFULL = lib$(LIBRARY).so.$(VERSION)
LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION) LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION)
LIBSHARED = lib$(LIBRARY).so LIBSHARED = lib$(LIBRARY).so
LIBFLAGS =
endif
LIBARCHIVE = lib$(LIBRARY).a LIBARCHIVE = lib$(LIBRARY).a
LIBCYGSHARED = cyg$(LIBRARY).dll LIBCYGSHARED = cyg$(LIBRARY).dll
...@@ -113,7 +121,7 @@ COBJ = $(CSRC:.c=.o) ...@@ -113,7 +121,7 @@ COBJ = $(CSRC:.c=.o)
CXXOBJ = $(CXXSRC:.cpp=.o) CXXOBJ = $(CXXSRC:.cpp=.o)
$(LIBFULL): $(CXXOBJ) $(COBJ) $(LIBFULL): $(CXXOBJ) $(COBJ)
$(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
$(LIBLOAD): $(LIBFULL) $(LIBLOAD): $(LIBFULL)
rm -f $(LIBLOAD) rm -f $(LIBLOAD)
...@@ -159,8 +167,8 @@ install.lib: all ...@@ -159,8 +167,8 @@ install.lib: all
./mkinstalldirs $(DESTDIR)${libdir} ./mkinstalldirs $(DESTDIR)${libdir}
./mkinstalldirs $(DESTDIR)${includedir}/nx ./mkinstalldirs $(DESTDIR)${includedir}/nx
$(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
$(INSTALL_LINK) libXcompext.so.3 $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir}
$(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir}
$(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
echo "Running ldconfig tool, this may take a while..." && ldconfig || true echo "Running ldconfig tool, this may take a while..." && ldconfig || true
...@@ -172,8 +180,8 @@ uninstall.bin: ...@@ -172,8 +180,8 @@ uninstall.bin:
uninstall.lib: uninstall.lib:
$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL) $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
$(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so.3 $(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
$(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so $(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h
$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h
echo "Running ldconfig tool, this may take a while..." && ldconfig || true echo "Running ldconfig tool, this may take a while..." && ldconfig || true
......
nxcompshad/Makefile.in
View file @ 638e31c2
...@@ -103,9 +103,17 @@ DEPENDINCLUDES = -I/usr/include/g++ -I/usr/include/g++-3 ...@@ -103,9 +103,17 @@ DEPENDINCLUDES = -I/usr/include/g++ -I/usr/include/g++-3
LIBRARY = Xcompshad LIBRARY = Xcompshad
LIBNAME = lib$(LIBRARY) 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) LIBFULL = lib$(LIBRARY).so.$(VERSION)
LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION) LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION)
LIBSHARED = lib$(LIBRARY).so LIBSHARED = lib$(LIBRARY).so
LIBFLAGS =
endif
LIBARCHIVE = lib$(LIBRARY).a LIBARCHIVE = lib$(LIBRARY).a
MSRC = Main.c MSRC = Main.c
...@@ -146,7 +154,7 @@ all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) ...@@ -146,7 +154,7 @@ all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE)
endif endif
$(LIBFULL): $(CXXOBJ) $(COBJ) $(LIBFULL): $(CXXOBJ) $(COBJ)
$(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(EXTRALIBS) $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(EXTRALIBS)
$(LIBLOAD): $(LIBFULL) $(LIBLOAD): $(LIBFULL)
rm -f $(LIBLOAD) rm -f $(LIBLOAD)
...@@ -193,9 +201,9 @@ install.lib: all ...@@ -193,9 +201,9 @@ install.lib: all
$(INSTALL_DIR) $(DESTDIR)${libdir} $(INSTALL_DIR) $(DESTDIR)${libdir}
$(INSTALL_DIR) $(DESTDIR)${includedir}/nx $(INSTALL_DIR) $(DESTDIR)${includedir}/nx
$(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
$(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir}
$(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir}
$(INSTALL_DATA) *.a $(DESTDIR)${libdir} $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir}
$(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx
echo "Running ldconfig tool, this may take a while..." && ldconfig || true echo "Running ldconfig tool, this may take a while..." && ldconfig || true
...@@ -207,9 +215,9 @@ uninstall.bin: ...@@ -207,9 +215,9 @@ uninstall.bin:
uninstall.lib: uninstall.lib:
$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL) $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so.3 $(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so $(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.a $(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE)
for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done
$(RM_DIR) $(DESTDIR)${libdir}/nx/ $(RM_DIR) $(DESTDIR)${libdir}/nx/
$(RM_DIR) $(DESTDIR)${includedir}/nx/ $(RM_DIR) $(DESTDIR)${includedir}/nx/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment