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>
diff --git a/decrepit/CMakeLists.txt b/decrepit/CMakeLists.txt index bebc624..e028f18 100644 --- 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)
diff --git a/decrepit/bio/CMakeLists.txt b/decrepit/bio/CMakeLists.txt deleted file mode 100644 index 95d9231..0000000 --- a/decrepit/bio/CMakeLists.txt +++ /dev/null
@@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - bio_decrepit - - OBJECT - - base64_bio.c -)
diff --git a/decrepit/blowfish/CMakeLists.txt b/decrepit/blowfish/CMakeLists.txt deleted file mode 100644 index 29729c4..0000000 --- a/decrepit/blowfish/CMakeLists.txt +++ /dev/null
@@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - blowfish - - OBJECT - - blowfish.c -)
diff --git a/decrepit/cast/CMakeLists.txt b/decrepit/cast/CMakeLists.txt deleted file mode 100644 index 2830381..0000000 --- a/decrepit/cast/CMakeLists.txt +++ /dev/null
@@ -1,10 +0,0 @@ -include_directories(../../include) - -add_library( - cast - - OBJECT - - cast.c - cast_tables.c -)
diff --git a/decrepit/cfb/CMakeLists.txt b/decrepit/cfb/CMakeLists.txt deleted file mode 100644 index 63a0ca5..0000000 --- a/decrepit/cfb/CMakeLists.txt +++ /dev/null
@@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - cfb - - OBJECT - - cfb.c -)
diff --git a/decrepit/des/CMakeLists.txt b/decrepit/des/CMakeLists.txt deleted file mode 100644 index 0ee5c2e..0000000 --- a/decrepit/des/CMakeLists.txt +++ /dev/null
@@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - des_decrepit - - OBJECT - - cfb64ede.c -)
diff --git a/decrepit/dh/CMakeLists.txt b/decrepit/dh/CMakeLists.txt deleted file mode 100644 index fb862b5..0000000 --- a/decrepit/dh/CMakeLists.txt +++ /dev/null
@@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - dh_decrepit - - OBJECT - - dh_decrepit.c -)
diff --git a/decrepit/dsa/CMakeLists.txt b/decrepit/dsa/CMakeLists.txt deleted file mode 100644 index cc64b60..0000000 --- a/decrepit/dsa/CMakeLists.txt +++ /dev/null
@@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - dsa_decrepit - - OBJECT - - dsa_decrepit.c -)
diff --git a/decrepit/evp/CMakeLists.txt b/decrepit/evp/CMakeLists.txt deleted file mode 100644 index e631a9a..0000000 --- a/decrepit/evp/CMakeLists.txt +++ /dev/null
@@ -1,10 +0,0 @@ -include_directories(../../include) - -add_library( - evp_decrepit - - OBJECT - - dss1.c - evp_do_all.c -)
diff --git a/decrepit/obj/CMakeLists.txt b/decrepit/obj/CMakeLists.txt deleted file mode 100644 index caaecd3..0000000 --- a/decrepit/obj/CMakeLists.txt +++ /dev/null
@@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - obj_decrepit - - OBJECT - - obj_decrepit.c -)
diff --git a/decrepit/rc4/CMakeLists.txt b/decrepit/rc4/CMakeLists.txt deleted file mode 100644 index 459b24e..0000000 --- a/decrepit/rc4/CMakeLists.txt +++ /dev/null
@@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - rc4_decrepit - - OBJECT - - rc4_decrepit.c -)
diff --git a/decrepit/ripemd/CMakeLists.txt b/decrepit/ripemd/CMakeLists.txt deleted file mode 100644 index d3dd284..0000000 --- a/decrepit/ripemd/CMakeLists.txt +++ /dev/null
@@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - ripemd_decrepit - - OBJECT - - ripemd.c -)
diff --git a/decrepit/rsa/CMakeLists.txt b/decrepit/rsa/CMakeLists.txt deleted file mode 100644 index 66d836b..0000000 --- a/decrepit/rsa/CMakeLists.txt +++ /dev/null
@@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - rsa_decrepit - - OBJECT - - rsa_decrepit.c -)
diff --git a/decrepit/ssl/CMakeLists.txt b/decrepit/ssl/CMakeLists.txt deleted file mode 100644 index fba0234..0000000 --- a/decrepit/ssl/CMakeLists.txt +++ /dev/null
@@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - ssl_decrepit - - OBJECT - - ssl_decrepit.c -)
diff --git a/decrepit/x509/CMakeLists.txt b/decrepit/x509/CMakeLists.txt deleted file mode 100644 index 930912d..0000000 --- a/decrepit/x509/CMakeLists.txt +++ /dev/null
@@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - x509_decrepit - - OBJECT - - x509_decrepit.c -)
diff --git a/decrepit/xts/CMakeLists.txt b/decrepit/xts/CMakeLists.txt deleted file mode 100644 index 7dccde0..0000000 --- a/decrepit/xts/CMakeLists.txt +++ /dev/null
@@ -1,9 +0,0 @@ -include_directories(../../include) - -add_library( - xts - - OBJECT - - xts.c -)