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

Cut-in support for CRYPTOPP_DATA_DIR during install

pull/3/head
Jeffrey Walton 2016-01-03 15:30:59 -05:00
parent 0c1f7d30ea
commit a17b23d42c
1 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
GNUmakefile
View File

@ -421,29 +421,37 @@ endif
.PHONY: install .PHONY: install
install: install:
$(MKDIR) -p $(DESTDIR)$(INCLUDEDIR)/cryptopp $(MKDIR) -p $(DESTDIR)$(INCLUDEDIR)/cryptopp
-$(CP) *.h $(DESTDIR)$(INCLUDEDIR)/cryptopp $(CP) *.h $(DESTDIR)$(INCLUDEDIR)/cryptopp
-$(CHMOD) 755 $(DESTDIR)$(INCLUDEDIR)/cryptopp -$(CHMOD) 0755 $(DESTDIR)$(INCLUDEDIR)/cryptopp
-$(CHMOD) 644 $(DESTDIR)$(INCLUDEDIR)/cryptopp/*.h -$(CHMOD) 0644 $(DESTDIR)$(INCLUDEDIR)/cryptopp/*.h
ifneq ($(wildcard libcryptopp.a),) ifneq ($(wildcard libcryptopp.a),)
$(MKDIR) -p $(DESTDIR)$(LIBDIR) $(MKDIR) -p $(DESTDIR)$(LIBDIR)
-$(CP) libcryptopp.a $(DESTDIR)$(LIBDIR) $(CP) libcryptopp.a $(DESTDIR)$(LIBDIR)
-$(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libcryptopp.a -$(CHMOD) 0644 $(DESTDIR)$(LIBDIR)/libcryptopp.a
endif endif
ifneq ($(wildcard cryptest.exe),) ifneq ($(wildcard cryptest.exe),)
$(MKDIR) -p $(DESTDIR)$(BINDIR) $(MKDIR) -p $(DESTDIR)$(BINDIR)
-$(CP) cryptest.exe $(DESTDIR)$(BINDIR) $(CP) cryptest.exe $(DESTDIR)$(BINDIR)
-$(CHMOD) 755 $(DESTDIR)$(BINDIR)/cryptest.exe -$(CHMOD) 0755 $(DESTDIR)$(BINDIR)/cryptest.exe
$(MKDIR) -p $(DESTDIR)$(DATADIR)/cryptopp
$(CP) -r TestData $(DESTDIR)$(DATADIR)/cryptopp
$(CP) -r TestVectors $(DESTDIR)$(DATADIR)/cryptopp
-$(CHMOD) 0755 $(DESTDIR)$(DATADIR)/cryptopp
-$(CHMOD) 0755 $(DESTDIR)$(DATADIR)/cryptopp/TestData
-$(CHMOD) 0755 $(DESTDIR)$(DATADIR)/cryptopp/TestVectors
-$(CHMOD) 0644 $(DESTDIR)$(DATADIR)/cryptopp/TestData/*.dat
-$(CHMOD) 0644 $(DESTDIR)$(DATADIR)/cryptopp/TestVectors/*.txt
endif endif
ifneq ($(wildcard libcryptopp.dylib),) ifneq ($(wildcard libcryptopp.dylib),)
$(MKDIR) -p $(DESTDIR)$(LIBDIR) $(MKDIR) -p $(DESTDIR)$(LIBDIR)
-$(CP) libcryptopp.dylib $(DESTDIR)$(LIBDIR) $(CP) libcryptopp.dylib $(DESTDIR)$(LIBDIR)
-install_name_tool -id $(DESTDIR)$(LIBDIR)/libcryptopp.dylib $(DESTDIR)$(LIBDIR)/libcryptopp.dylib -install_name_tool -id $(DESTDIR)$(LIBDIR)/libcryptopp.dylib $(DESTDIR)$(LIBDIR)/libcryptopp.dylib
-$(CHMOD) 755 $(DESTDIR)$(LIBDIR)/libcryptopp.dylib -$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.dylib
endif endif
ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),) ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),)
$(MKDIR) -p $(DESTDIR)$(LIBDIR) $(MKDIR) -p $(DESTDIR)$(LIBDIR)
-$(CP) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR) $(CP) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)
-$(CHMOD) 755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) -$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
ifeq ($(HAS_SOLIB_VERSION),1) ifeq ($(HAS_SOLIB_VERSION),1)
-$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
$(LDCONF) $(DESTDIR)$(LIBDIR) $(LDCONF) $(DESTDIR)$(LIBDIR)
@ -455,6 +463,7 @@ remove uninstall:
-$(RM) -r $(DESTDIR)$(INCLUDEDIR)/cryptopp -$(RM) -r $(DESTDIR)$(INCLUDEDIR)/cryptopp
-$(RM) $(DESTDIR)$(LIBDIR)/libcryptopp.a -$(RM) $(DESTDIR)$(LIBDIR)/libcryptopp.a
-$(RM) $(DESTDIR)$(BINDIR)/cryptest.exe -$(RM) $(DESTDIR)$(BINDIR)/cryptest.exe
-$(RM) -r $(DESTDIR)$(DATADIR)/cryptopp
ifneq ($(IS_DARWIN),0) ifneq ($(IS_DARWIN),0)
-$(RM) $(DESTDIR)$(LIBDIR)/libcryptopp.dylib -$(RM) $(DESTDIR)$(LIBDIR)/libcryptopp.dylib
else else
@ -585,6 +594,22 @@ cpu.o:
endif endif
endif endif
# Only use CRYPTOPP_DATA_DIR if its not set in CXXFLAGS
ifeq ($(findstring -DCRYPTOPP_DATA_DIR,$(CXXFLAGS)),)
ifneq ($(strip $(CRYPTOPP_DATA_DIR)),)
validat%.o : validat%.cpp
$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
bench.o : bench.cpp
$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
bench%.o : bench%.cpp
$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
datatest.o : datatest.cpp
$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
test.o : test.cpp
$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
endif
endif
%.dllonly.o : %.cpp %.dllonly.o : %.cpp
$(CXX) $(CXXFLAGS) -DCRYPTOPP_DLL_ONLY -c $< -o $@ $(CXX) $(CXXFLAGS) -DCRYPTOPP_DLL_ONLY -c $< -o $@