Description: Use the correct library naming scheme on OS X. It differs from other UNIX-based systems. Author: Clemens Lang --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -82,9 +82,17 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/ 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