diff options
| author | Clemens Lang <cal@macports.org> | 2015-03-15 17:29:50 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-03-15 17:29:50 +0100 |
| commit | 638e31c2f33723123d35ce65db88071a1be5cdb0 (patch) | |
| tree | c147bbfce3bd61736e87e3c4b102f66035ccb324 /nxcomp | |
| parent | ad7e12ed39cc4091ff878ea2b3e748e0147dd57f (diff) | |
| download | nx-libs-638e31c2f33723123d35ce65db88071a1be5cdb0.tar.gz nx-libs-638e31c2f33723123d35ce65db88071a1be5cdb0.tar.bz2 nx-libs-638e31c2f33723123d35ce65db88071a1be5cdb0.zip | |
nxcomp{,ext,shad}: use the correct library naming scheme on OS X. It differs from other UNIX-based systems.
Diffstat (limited to 'nxcomp')
| -rw-r--r-- | nxcomp/Makefile.in | 22 |
1 files changed, 15 insertions, 7 deletions
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 |