Clean up export structure of remaining just dependencies

3 files changed, 43 insertions, 3 deletions

diff --git a/etc/import/TARGETS.catch2 b/etc/import/TARGETS.catch2
index 80bfcac8..9be5ce16 100644
--- a/etc/import/TARGETS.catch2
+++ b/etc/import/TARGETS.catch2
@@ -21,6 +21,26 @@
     }
   }
 , "catch2":
+  { "type": "export"
+  , "target": "catch2_internal"
+  , "flexible_config":
+    [ "ADD_CFLAGS"
+    , "ADD_CXXFLAGS"
+    , "AR"
+    , "ARCH"
+    , "CC"
+    , "CFLAGS"
+    , "COMPILER_FAMILY"
+    , "CXX"
+    , "CXXFLAGS"
+    , "DEBUG"
+    , "ENV"
+    , "HOST_ARCH"
+    , "OS"
+    , "TARGET_ARCH"
+    ]
+  }
+, "catch2_internal":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["Catch2"]
   , "hdrs": [["./", "src/catch2", "hdrs"], "catch2-config-header"]
diff --git a/etc/import/TARGETS.re2 b/etc/import/TARGETS.re2
index 28bb1882..95775dea 100644
--- a/etc/import/TARGETS.re2
+++ b/etc/import/TARGETS.re2
@@ -1,4 +1,24 @@
 { "re2":
+  { "type": "export"
+  , "target": "re2_internal"
+  , "flexible_config":
+    [ "ADD_CFLAGS"
+    , "ADD_CXXFLAGS"
+    , "AR"
+    , "ARCH"
+    , "CC"
+    , "CFLAGS"
+    , "COMPILER_FAMILY"
+    , "CXX"
+    , "CXXFLAGS"
+    , "DEBUG"
+    , "ENV"
+    , "HOST_ARCH"
+    , "OS"
+    , "TARGET_ARCH"
+    ]
+  }
+, "re2_internal":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["re2"]
   , "srcs":
diff --git a/etc/import/src/google/protobuf/TARGETS.protobuf b/etc/import/src/google/protobuf/TARGETS.protobuf
index 1fed9c43..80707adf 100644
--- a/etc/import/src/google/protobuf/TARGETS.protobuf
+++ b/etc/import/src/google/protobuf/TARGETS.protobuf
@@ -386,7 +386,7 @@
     , "wire_format.cc"
     , "wrappers.pb.cc"
     ]
-  , "deps": ["libprotobuf_lite", ["@", "zlib", "", "zlib"]]
+  , "deps": [["", "libprotobuf_lite"], ["@", "zlib", "", "zlib"]]
   }
 , "libprotoc":
   { "type": ["@", "rules", "CC", "library"]
@@ -476,13 +476,13 @@
     , "compiler/subprocess.cc"
     , "compiler/zip_writer.cc"
     ]
-  , "deps": ["libprotobuf"]
+  , "deps": [["", "libprotobuf"]]
   }
 , "protoc":
   { "type": ["@", "rules", "CC", "binary"]
   , "name": ["protoc"]
   , "srcs": ["compiler/main.cc"]
-  , "private-deps": ["libprotoc"]
+  , "private-deps": [["", "libprotoc"]]
   , "private-ldflags": ["-pthread"]
   }
 }