Rm polarssl compat targets from Makefiles
diff --git a/library/.gitignore b/library/.gitignore
index 09d13d2..54e4276 100644
--- a/library/.gitignore
+++ b/library/.gitignore
@@ -1,5 +1,4 @@
*.o
-libpolarssl.*
libmbedtls.*
*.sln
*.vcxproj
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index d14df8c..b67fb2c 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -134,24 +134,3 @@
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)
diff --git a/library/Makefile b/library/Makefile
index d8a4dd4..25e9c4b 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -80,17 +80,9 @@
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 @@
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 @@
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