[CRIU] [PATCH 0/9 v2] Makefile cleanups/fixes

Kir Kolyshkin kir at openvz.org
Wed Feb 22 15:15:40 PST 2017


The centerpiece of this is making Makefiles in lib/ work the same way
as all the others do, and the removal of $(SRC_DIR). Around it are
some nice cleanups and fixes.

The work is in by no means complete, meaning there are more knots to
untie, but this series is good enough to be merged IMHO. Once I have
another slow weekend with time to spare, I'll give it another shot.

v2: fixes after review by Dmitry Safonov, +more cleanups and fixes

Kir Kolyshkin (9):
  criu Makefiles: rm old compel leftovers
  lib Makefiles: integrate
  Makefile.install: fix uninstall target
  nmk: return --no-print-directory
  Makefiles: nuke $(SRC_DIR)
  Makefiles: get rid of extra includes
  Makefile: reorg top-level clean/mrproper
  Makefiles: remove @true
  Makefiles: protect from % rules, don't rebuild

 Makefile                       | 67 ++++++++++++++++++++++--------------------
 Makefile.compel                |  6 ++--
 Makefile.config                |  6 ++--
 Makefile.install               |  9 +++---
 compel/Makefile                |  2 +-
 compel/plugins/Makefile        |  2 +-
 criu/Makefile                  | 34 +++++++++++----------
 criu/Makefile.crtools          |  2 +-
 criu/arch/aarch64/Makefile     |  5 ++--
 criu/arch/arm/Makefile         |  5 ++--
 criu/arch/ppc64/Makefile       |  4 +--
 criu/arch/x86/Makefile         |  4 +--
 criu/pie/Makefile              | 14 ++-------
 criu/pie/Makefile.library      |  3 --
 lib/Makefile                   | 60 ++++++++++++++++++-------------------
 lib/c/Makefile                 |  8 ++---
 lib/py/Makefile                | 24 ++++++++++-----
 lib/py/images/Makefile         | 23 +++++++--------
 scripts/crit-setup.py          |  4 +--
 scripts/nmk/Makefile           |  3 +-
 scripts/nmk/scripts/build.mk   |  3 +-
 scripts/nmk/scripts/include.mk |  2 +-
 22 files changed, 144 insertions(+), 146 deletions(-)

-- 
2.9.3



More information about the CRIU mailing list