2017-03-05 15:27:36 +00:00
|
|
|
Index: GNUmakefile
|
2016-09-14 16:45:39 +00:00
|
|
|
===================================================================
|
2017-03-05 15:27:36 +00:00
|
|
|
--- GNUmakefile.orig 2016-10-11 01:49:54.000000000 +0200
|
|
|
|
|
+++ GNUmakefile 2017-03-03 06:40:32.760437872 +0200
|
|
|
|
|
@@ -74,7 +74,7 @@ ifeq ($(DATADIR),)
|
|
|
|
|
DATADIR := $(PREFIX)/share
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(LIBDIR),)
|
|
|
|
|
-LIBDIR := $(PREFIX)/lib
|
|
|
|
|
+LIBDIR := $(PREFIX)/$(LIB)
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(BINDIR),)
|
|
|
|
|
BINDIR := $(PREFIX)/bin
|
|
|
|
|
@@ -405,7 +405,7 @@ ifeq ($(HAS_SOLIB_VERSION),1)
|
|
|
|
|
SOLIB_VERSION_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH)
|
|
|
|
|
# Different patchlevels are compatible, minor versions are not
|
|
|
|
|
SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR)
|
|
|
|
|
-SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
|
|
|
|
|
+SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_VERSION_SUFFIX)
|
|
|
|
|
endif # HAS_SOLIB_VERSION
|
|
|
|
|
|
|
|
|
|
###########################################################
|
2017-02-24 10:50:11 +00:00
|
|
|
@@ -640,8 +640,8 @@ endif
|
2016-09-14 16:45:39 +00:00
|
|
|
libcryptopp.dylib: $(LIBOBJS)
|
|
|
|
|
$(CXX) -dynamiclib -o $@ $(CXXFLAGS) -install_name "$@" -current_version "$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH)" -compatibility_version "$(LIB_MAJOR).$(LIB_MINOR)" -headerpad_max_install_names $(LDFLAGS) $(LIBOBJS)
|
|
|
|
|
|
2017-02-24 10:50:11 +00:00
|
|
|
-cryptest.exe: libcryptopp.a $(TESTOBJS)
|
2013-03-01 18:39:52 +00:00
|
|
|
- $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS)
|
2017-02-24 10:50:11 +00:00
|
|
|
+cryptest.exe: libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(TESTOBJS)
|
2013-03-01 18:39:52 +00:00
|
|
|
+ $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS)
|
2010-08-09 22:30:27 +00:00
|
|
|
|
2016-09-14 16:45:39 +00:00
|
|
|
# Makes it faster to test changes
|
|
|
|
|
nolib: $(OBJS)
|