arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added a makefile target to build the versioned .so if the unversioned name is given. 

Added DESTDIR to an ldconf line that was missint it.
pull/90/head
Todd Knarr 2015-12-26 03:00:31 -08:00
parent f84b3964ee
commit 09d194d8cf
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
GNUmakefile
View File

@ -418,7 +418,7 @@ else
ifeq ($(HAS_SOLIB_VERSION),1) ifeq ($(HAS_SOLIB_VERSION),1)
-$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
-$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.so -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.so
$(LDCONF) $(PREFIX)/lib $(LDCONF) $(DESTDIR)$(PREFIX)/lib
endif endif
endif endif
@ -426,6 +426,9 @@ libcryptopp.a: public_service | $(LIBOBJS)
$(AR) $(ARFLAGS) $@ $(LIBOBJS) $(AR) $(ARFLAGS) $@ $(LIBOBJS)
$(RANLIB) $@ $(RANLIB) $@
.PHONY: libcryptopp.so
libcryptopp.so: libcryptopp$(SOLIB_VERSION_SUFFIX)
libcryptopp.so$(SOLIB_VERSION_SUFFIX): public_service | $(LIBOBJS) libcryptopp.so$(SOLIB_VERSION_SUFFIX): public_service | $(LIBOBJS)
$(CXX) -shared $(SOLIB_FLAGS) -o $@ $(CXXFLAGS) $(GOLD_OPTION) $(LIBOBJS) $(LDLIBS) $(CXX) -shared $(SOLIB_FLAGS) -o $@ $(CXXFLAGS) $(GOLD_OPTION) $(LIBOBJS) $(LDLIBS)
ifeq ($(HAS_SOLIB_VERSION),1) ifeq ($(HAS_SOLIB_VERSION),1)