From ad31d1e1c85d4c95771326a1bd5923b30c04421d Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 14 Jul 2017 22:46:56 +0300
Subject: Make use of wildcards in buildfiles

---
 buildfile              |  7 +++----
 odb/sqlite/buildfile   | 50 ++++----------------------------------------------
 tests/basics/buildfile |  2 +-
 tests/buildfile        |  4 +---
 4 files changed, 9 insertions(+), 54 deletions(-)

diff --git a/buildfile b/buildfile
index 35a2d40..b951682 100644
--- a/buildfile
+++ b/buildfile
@@ -2,11 +2,10 @@
 # copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-d = odb/sqlite/ tests/
-./: $d doc{GPLv2 INSTALL LICENSE NEWS README version} file{manifest}
-include $d
+./: {*/ -build/ -m4/ -etc/} doc{GPLv2 INSTALL LICENSE NEWS README version} \
+    file{manifest}
 
 # Don't install tests or the INSTALL file.
 #
-dir{tests/}: install = false
+dir{tests/}:     install = false
 doc{INSTALL}@./: install = false
diff --git a/odb/sqlite/buildfile b/odb/sqlite/buildfile
index c2f99d4..9d648cb 100644
--- a/odb/sqlite/buildfile
+++ b/odb/sqlite/buildfile
@@ -5,52 +5,10 @@
 import int_libs  = libodb%lib{odb}
 import int_libs += libsqlite3%lib{sqlite3}
 
-lib{odb-sqlite}:                                                  \
-               {hxx            }{ auto-handle                   } \
-               {hxx            }{ binding                       } \
-               {hxx            }{ blob                          } \
-               {hxx            }{ blob-stream                   } \
-               {hxx ixx     cxx}{ connection                    } \
-               {hxx         cxx}{ connection-factory            } \
-               {hxx     txx    }{ container-statements          } \
-               {hxx ixx     cxx}{ database                      } \
-               {hxx         cxx}{ error                         } \
-               {hxx         cxx}{ exceptions                    } \
-               {hxx            }{ forward                       } \
-               {hxx     txx    }{ no-id-object-result           } \
-               {hxx     txx    }{ no-id-object-statements       } \
-               {hxx     txx    }{ polymorphic-object-result     } \
-               {hxx     txx    }{ polymorphic-object-statements } \
-               {hxx         cxx}{ prepared-query                } \
-               {hxx ixx txx cxx}{ query                         } \
-               {            cxx}{ query-const-expr              } \
-               {hxx ixx txx cxx}{ query-dynamic                 } \
-               {hxx     txx    }{ section-statements            } \
-               {hxx     txx    }{ simple-object-result          } \
-               {hxx ixx txx cxx}{ simple-object-statements      } \
-               {hxx            }{ sqlite-types                  } \
-               {hxx     txx cxx}{ statement-cache               } \
-               {hxx         cxx}{ statement                     } \
-               {hxx         cxx}{ statements-base               } \
-               {hxx         cxx}{ stream                        } \
-               {hxx            }{ text                          } \
-               {hxx            }{ text-stream                   } \
-               {hxx         cxx}{ tracer                        } \
-               {hxx         cxx}{ traits                        } \
-               {hxx            }{ traits-calls                  } \
-               {hxx ixx     cxx}{ transaction                   } \
-               {hxx ixx     cxx}{ transaction-impl              } \
-               {hxx            }{ version                       } \
-               {hxx            }{ version-build2                } \
-               {hxx     txx    }{ view-result                   } \
-               {hxx     txx    }{ view-statements               } \
-       details/{hxx            }{ config                        } \
-       details/{hxx            }{ conversion                    } \
-       details/{hxx            }{ export                        } \
-       details/{hxx ixx     cxx}{ options                       } \
-details/build2/{h              }{ config                        } \
-details/build2/{h              }{ config-vc                     } \
-                                  $int_libs
+lib{odb-sqlite}: {hxx ixx txx cxx}{* -version-build2} {hxx}{version-build2}   \
+         details/{hxx ixx txx cxx}{* -options} details/{hxx ixx cxx}{options} \
+  details/build2/{h}{*}                                                       \
+                 $int_libs
 
 hxx{version-build2}: in{version-build2} $src_root/file{manifest}
 hxx{version-build2}: dist = true
diff --git a/tests/basics/buildfile b/tests/basics/buildfile
index 6290172..824c638 100644
--- a/tests/basics/buildfile
+++ b/tests/basics/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libodb-sqlite%lib{odb-sqlite}
 
-exe{driver}: cxx{driver} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/buildfile b/tests/buildfile
index 8502dbe..545984d 100644
--- a/tests/buildfile
+++ b/tests/buildfile
@@ -2,6 +2,4 @@
 # copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-d = basics/
-./: $d
-include $d
+./: {*/ -build/}
-- 
cgit v1.1