Flatten the decrepit target.

https://boringssl-review.googlesource.com/c/boringssl/+/31364 wants to add a dependency to each target, which is much easier with fewer of them. Start with decrepit. Change-Id: Ib3777063d545dfebe3e2b8448eb7e5bbb5c3aaac Reviewed-on: https://boringssl-review.googlesource.com/31584 Reviewed-by: Adam Langley <agl@google.com>
2018-09-05 15:12:31 -05:00 · 2018-09-05 15:12:31 -05:00 · d144539da6
commit d144539da6
parent 8e09d90142
16 changed files with 17 additions and 168 deletions
--- a/decrepit/CMakeLists.txt
+++ b/decrepit/CMakeLists.txt
@ -1,39 +1,25 @@
 include_directories(../include)

-add_subdirectory(bio)
-add_subdirectory(blowfish)
-add_subdirectory(cast)
-add_subdirectory(cfb)
-add_subdirectory(des)
-add_subdirectory(dh)
-add_subdirectory(dsa)
-add_subdirectory(evp)
-add_subdirectory(obj)
-add_subdirectory(rc4)
-add_subdirectory(ripemd)
-add_subdirectory(rsa)
-add_subdirectory(ssl)
-add_subdirectory(x509)
-add_subdirectory(xts)
-
 add_library(
  decrepit

-  $<TARGET_OBJECTS:bio_decrepit>
-  $<TARGET_OBJECTS:blowfish>
-  $<TARGET_OBJECTS:cast>
-  $<TARGET_OBJECTS:cfb>
-  $<TARGET_OBJECTS:des_decrepit>
-  $<TARGET_OBJECTS:dh_decrepit>
-  $<TARGET_OBJECTS:dsa_decrepit>
-  $<TARGET_OBJECTS:evp_decrepit>
-  $<TARGET_OBJECTS:obj_decrepit>
-  $<TARGET_OBJECTS:rc4_decrepit>
-  $<TARGET_OBJECTS:ripemd_decrepit>
-  $<TARGET_OBJECTS:rsa_decrepit>
-  $<TARGET_OBJECTS:ssl_decrepit>
-  $<TARGET_OBJECTS:x509_decrepit>
-  $<TARGET_OBJECTS:xts>
+  bio/base64_bio.c
+  blowfish/blowfish.c
+  cast/cast.c
+  cast/cast_tables.c
+  cfb/cfb.c
+  des/cfb64ede.c
+  dh/dh_decrepit.c
+  dsa/dsa_decrepit.c
+  evp/dss1.c
+  evp/evp_do_all.c
+  obj/obj_decrepit.c
+  rc4/rc4_decrepit.c
+  ripemd/ripemd.c
+  rsa/rsa_decrepit.c
+  ssl/ssl_decrepit.c
+  x509/x509_decrepit.c
+  xts/xts.c
 )

 target_link_libraries(decrepit crypto ssl)
--- a/decrepit/bio/CMakeLists.txt
+++ b/decrepit/bio/CMakeLists.txt
@ -1,9 +0,0 @@
-include_directories(../../include)
-
-add_library(
-  bio_decrepit
-
-  OBJECT
-
-  base64_bio.c
-)
--- a/decrepit/blowfish/CMakeLists.txt
+++ b/decrepit/blowfish/CMakeLists.txt
@ -1,9 +0,0 @@
-include_directories(../../include)
-
-add_library(
-  blowfish
-
-  OBJECT
-
-  blowfish.c
-)
--- a/decrepit/cast/CMakeLists.txt
+++ b/decrepit/cast/CMakeLists.txt
@ -1,10 +0,0 @@
-include_directories(../../include)
-
-add_library(
-  cast
-
-  OBJECT
-
-  cast.c
-  cast_tables.c
-)
--- a/decrepit/cfb/CMakeLists.txt
+++ b/decrepit/cfb/CMakeLists.txt
@ -1,9 +0,0 @@
-include_directories(../../include)
-
-add_library(
-  cfb
-
-  OBJECT
-
-  cfb.c
-)
--- a/decrepit/des/CMakeLists.txt
+++ b/decrepit/des/CMakeLists.txt
@ -1,9 +0,0 @@
-include_directories(../../include)
-
-add_library(
-  des_decrepit
-
-  OBJECT
-
-  cfb64ede.c
-)
--- a/decrepit/dh/CMakeLists.txt
+++ b/decrepit/dh/CMakeLists.txt
@ -1,9 +0,0 @@
-include_directories(../../include)
-
-add_library(
-  dh_decrepit
-
-  OBJECT
-
-  dh_decrepit.c
-)
--- a/decrepit/dsa/CMakeLists.txt
+++ b/decrepit/dsa/CMakeLists.txt
@ -1,9 +0,0 @@
-include_directories(../../include)
-
-add_library(
-  dsa_decrepit
-
-  OBJECT
-
-  dsa_decrepit.c
-)
--- a/decrepit/evp/CMakeLists.txt
+++ b/decrepit/evp/CMakeLists.txt
@ -1,10 +0,0 @@
-include_directories(../../include)
-
-add_library(
-  evp_decrepit
-
-  OBJECT
-
-  dss1.c
-  evp_do_all.c
-)
--- a/decrepit/obj/CMakeLists.txt
+++ b/decrepit/obj/CMakeLists.txt
@ -1,9 +0,0 @@
-include_directories(../../include)
-
-add_library(
-  obj_decrepit
-
-  OBJECT
-
-  obj_decrepit.c
-)
--- a/decrepit/rc4/CMakeLists.txt
+++ b/decrepit/rc4/CMakeLists.txt
@ -1,9 +0,0 @@
-include_directories(../../include)
-
-add_library(
-  rc4_decrepit
-
-  OBJECT
-
-  rc4_decrepit.c
-)
--- a/decrepit/ripemd/CMakeLists.txt
+++ b/decrepit/ripemd/CMakeLists.txt
@ -1,9 +0,0 @@
-include_directories(../../include)
-
-add_library(
-  ripemd_decrepit
-
-  OBJECT
-
-  ripemd.c
-)
--- a/decrepit/rsa/CMakeLists.txt
+++ b/decrepit/rsa/CMakeLists.txt
@ -1,9 +0,0 @@
-include_directories(../../include)
-
-add_library(
-  rsa_decrepit
-
-  OBJECT
-
-  rsa_decrepit.c
-)
--- a/decrepit/ssl/CMakeLists.txt
+++ b/decrepit/ssl/CMakeLists.txt
@ -1,9 +0,0 @@
-include_directories(../../include)
-
-add_library(
-  ssl_decrepit
-
-  OBJECT
-
-  ssl_decrepit.c
-)
--- a/decrepit/x509/CMakeLists.txt
+++ b/decrepit/x509/CMakeLists.txt
@ -1,9 +0,0 @@
-include_directories(../../include)
-
-add_library(
-  x509_decrepit
-
-  OBJECT
-
-  x509_decrepit.c
-)
--- a/decrepit/xts/CMakeLists.txt
+++ b/decrepit/xts/CMakeLists.txt
@ -1,9 +0,0 @@
-include_directories(../../include)
-
-add_library(
-  xts
-
-  OBJECT
-
-  xts.c
-)