In some cases, it is desirable to build the parser without building the

binary portions (Hurd). This patch splits up the build targets so this is
possible:

"main" becomes "arch"

"indep" is created and depends on "docs"
po building is moved from "main" to "indep"

"all" has "tests" removed (standard build practices are to "make" then
"make check" so I think "tests"/"check" should stay separate from "all").

redundant chunk is removed (this exists twice in the Makefile):
-.SILENT: check
-check: tests

"install" is split into "install-indep" and "install-arch"

"install-arch" requires "arch" and only installs the binaries

"install-indep" requires "indep" and only install non-binaries

Additionally, update the README to mention the "check" target both for the
parser and the utils.

Signed-off-by: Kees Cook <kees.cook@canonical.com>
Acked-by: Steve Beattie <steve@nxnw.org>
This commit is contained in:
Kees Cook 2011-05-27 14:57:43 -07:00
parent e9d5d491b8
commit 156a980c30
2 changed files with 16 additions and 10 deletions

4
README
View file

@ -74,14 +74,14 @@ $ make check
Utilities:
$ cd utils
$ make
$ make check
$ make install
parser:
$ cd parser
$ make
$ make tests # not strictly necessary as they are run during the
# build by default
$ make check
$ make install

View file

@ -130,8 +130,7 @@ techdoc.txt: techdoc/index.html
# targets arranged this way so that people who don't want full docs can
# pick specific targets they want.
main: $(TOOLS)
$(Q)make -C po all
arch: $(TOOLS)
manpages: $(MANPAGES)
@ -141,7 +140,11 @@ pdf: techdoc.pdf
docs: manpages htmlmanpages pdf
all: main docs tests
indep: docs
$(Q)make -C po all
all: arch indep
.PHONY: libstdc++.a
libstdc++.a:
@ -229,9 +232,6 @@ tests: ${TESTS}
sh -e -c 'for test in ${TESTS} ; do echo "*** running $${test}" && ./$${test}; done'
$(Q)make -s -C tst tests
.SILENT: check
check: tests
# always need to rebuild.
.SILENT: $(AAREOBJECT)
.PHONY: $(AAREOBJECT)
@ -270,15 +270,21 @@ install-debian:
.PHONY: install-unknown
install-unknown:
INSTALLDEPS=$(TOOLS)
INSTALLDEPS=arch
ifdef DISTRO
INSTALLDEPS+=install-$(DISTRO)
endif
.PHONY: install
install: $(INSTALLDEPS)
install: install-indep install-arch
.PHONY: install-arch
install-arch: $(INSTALLDEPS)
install -m 755 -d $(DESTDIR)/sbin
install -m 755 ${TOOLS} $(DESTDIR)/sbin
.PHONY: install-indep
install-indep:
install -m 755 -d $(INSTALL_CONFDIR)
install -m 644 subdomain.conf $(INSTALL_CONFDIR)
install -m 755 -d ${DESTDIR}/var/lib/apparmor