Suyu/mbedtls
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/mbedtls.git synced 2025-12-23 15:55:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rm polarssl compat targets from Makefiles

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-03-09 16:57:18 +00:00
parent 8fe411e9c1
commit 129db08c90
6 changed files with 6 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

1
library/.gitignore vendored
View file

@ -1,5 +1,4 @@
*.o
libpolarssl.*
libmbedtls.*
*.sln
*.vcxproj

21
library/CMakeLists.txt
View file

@ -134,24 +134,3 @@ if(USE_SHARED_MBEDTLS_LIBRARY)
DESTINATION ${LIB_INSTALL_DIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
endif(USE_SHARED_MBEDTLS_LIBRARY)
if(UNIX)
add_custom_target(polarssl
DEPENDS mbedtls # TODO: and mbedtls_static is shared is defined
COMMAND ${CMAKE_SOURCE_DIR}/scripts/polarssl_symlinks.sh ${CMAKE_BINARY_DIR}/library
)
if(USE_STATIC_MBEDTLS_LIBRARY AND USE_SHARED_MBEDTLS_LIBRARY)
add_dependencies(polarssl mbedtls_static)
endif()
add_custom_target(polarssl-clean
COMMAND make clean
COMMAND rm -f ${CMAKE_BINARY_DIR}/library/libpolarssl.*
)
add_custom_target(polarssl-install
COMMAND make install
COMMAND ${CMAKE_SOURCE_DIR}/scripts/polarssl_symlinks.sh ${DESTDIR}/${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}
)
endif(UNIX)

31
library/Makefile
View file

@ -80,17 +80,9 @@ else
all: shared static
endif
static: libpolarssl.a
static: libmbedtls.a
shared: libpolarssl.$(DLEXT)
libpolarssl.a: libmbedtls.a
echo " LN $@ -> $?"
ifndef WINDOWS
ln -sf $? $@
else
copy /y /b $? $@
endif
shared: libmbedtls.$(DLEXT)
libmbedtls.a: $(OBJS)
echo " AR $@"
@ -98,21 +90,6 @@ libmbedtls.a: $(OBJS)
echo " RL $@"
$(AR) s $@
libpolarssl.$(DLEXT): libmbedtls.$(DLEXT)
echo " LN $@ -> $?"
ifndef WINDOWS
ln -sf $? $@
else
copy /y /b $? $@
endif
ifdef WINDOWS_BUILD
ifndef WINDOWS
ln -sf $?.a $@.a
else
copy /y /b $?.a $@.a
endif
endif
libmbedtls.$(SOEXT): $(OBJS)
echo " LD $@"
$(CC) ${LDFLAGS} -shared -Wl,-soname,$@ -o $@ $(OBJS)
@ -135,8 +112,8 @@ libmbedtls.dll: $(OBJS)
clean:
ifndef WINDOWS
rm -f *.o libpolarssl.* libmbedtls.*
rm -f *.o libmbedtls.*
endif
ifdef WINDOWS
del /Q /F *.o libpolarssl.* libmbedtls.*
del /Q /F *.o libmbedtls.*
endif