Merge branch 'di/parse-options-split'

* di/parse-options-split:
  Reduce parse-options.o dependencies
  parse-options: export opterr, optbug

diff --cc Makefile
Simple merge

diff --cc setup.c
Simple merge