From 8bdf75596de37b0e6d9e33fff27f2431af1175da Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 22 Aug 2016 16:21:14 +0200
Subject: Minor fixes and cleanups

---
 .gitignore     | 9 +++++++--
 bpkg/buildfile | 6 ++----
 bpkg/export    | 4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index f01859a..01994ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,13 @@
 # Compiler/linker output.
 #
-*.o
 *.d
+*.o
+*.obj
 *.so
+*.dll
 *.a
+*.lib
+*.exp
 *.exe
-core
+*.exe.dlls/
+*.exe.manifest
diff --git a/bpkg/buildfile b/bpkg/buildfile
index f692910..a7ce32e 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -13,15 +13,13 @@ lib{bpkg}:                               \
 $libs
 
 cxx.poptions =+ -I$src_root
+obja{*}: cxx.poptions += -DLIBBPKG_STATIC_BUILD
+objs{*}: cxx.poptions += -DLIBBPKG_SHARED_BUILD
 
 lib{bpkg}: cxx.export.poptions = -I$src_root
-
 liba{bpkg}: cxx.export.poptions += -DLIBBPKG_STATIC
 libs{bpkg}: cxx.export.poptions += -DLIBBPKG_SHARED
 
-obja{*}: cxx.poptions += -DLIBBPKG_STATIC_BUILD
-objs{*}: cxx.poptions += -DLIBBPKG_SHARED_BUILD
-
 # Install into the bpkg/ subdirectory of, say, /usr/include/.
 #
 install.include = $install.include/bpkg
diff --git a/bpkg/export b/bpkg/export
index 7bbb994..63dd09c 100644
--- a/bpkg/export
+++ b/bpkg/export
@@ -7,7 +7,7 @@
 
 // Normally we don't export class templates (but do complete specializations),
 // inline functions, and classes with only inline member functions. Exporting
-// classes that inherit from non-exported/import bases (e.g., std::string)
+// classes that inherit from non-exported/imported bases (e.g., std::string)
 // will end up badly. The only known workarounds are to not inherit or to not
 // export. Also, MinGW GCC doesn't like seeing non-exported function being
 // used before their inline definition. The workaround is to reorder code. In
@@ -30,7 +30,7 @@
 #    define LIBBPKG_EXPORT
 #  endif
 #else
-// If none of the above macros are defined, then we assume we are being using
+// If none of the above macros are defined, then we assume we are being used
 // by some third-party build system that cannot/doesn't signal the library
 // type. Note that this fallback works for both static and shared but in case
 // of shared will be sub-optimal compared to having dllimport.
-- 
cgit v1.1