diff options
author | 2016-11-03 15:06:57 +0100 | |
---|---|---|
committer | 2016-11-03 15:06:57 +0100 | |
commit | 2aafd9bd3a96b578bf423eb8faba0efe965c52d5 (patch) | |
tree | 6ab4d26a6daad1e3972a86dbdcbe67030d710883 /Makefile.in | |
parent | Improvements for Zathura profile (diff) | |
parent | removed warning if --quiet is enabled (diff) | |
download | firejail-2aafd9bd3a96b578bf423eb8faba0efe965c52d5.tar.gz firejail-2aafd9bd3a96b578bf423eb8faba0efe965c52d5.tar.zst firejail-2aafd9bd3a96b578bf423eb8faba0efe965c52d5.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 3f08c5952..86acc206c 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,6 +1,6 @@ | |||
1 | all: apps man | 1 | all: apps man |
2 | MYLIBS = src/lib | 2 | MYLIBS = src/lib |
3 | APPS = src/firejail src/firemon src/firecfg src/libtrace src/libtracelog src/ftee src/faudit src/libconnect | 3 | APPS = src/firejail src/firemon src/firecfg src/libtrace src/libtracelog src/ftee src/faudit src/libconnect src/fnet src/fseccomp |
4 | MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 | 4 | MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 |
5 | 5 | ||
6 | prefix=@prefix@ | 6 | prefix=@prefix@ |
@@ -76,6 +76,8 @@ realinstall: | |||
76 | install -c -m 0755 src/fshaper/fshaper.sh $(DESTDIR)/$(libdir)/firejail/. | 76 | install -c -m 0755 src/fshaper/fshaper.sh $(DESTDIR)/$(libdir)/firejail/. |
77 | install -c -m 0644 src/firecfg/firecfg.config $(DESTDIR)/$(libdir)/firejail/. | 77 | install -c -m 0644 src/firecfg/firecfg.config $(DESTDIR)/$(libdir)/firejail/. |
78 | install -c -m 0755 src/faudit/faudit $(DESTDIR)/$(libdir)/firejail/. | 78 | install -c -m 0755 src/faudit/faudit $(DESTDIR)/$(libdir)/firejail/. |
79 | install -c -m 0755 src/fnet/fnet $(DESTDIR)/$(libdir)/firejail/. | ||
80 | install -c -m 0755 src/fseccomp/fseccomp $(DESTDIR)/$(libdir)/firejail/. | ||
79 | # documents | 81 | # documents |
80 | install -m 0755 -d $(DESTDIR)/$(DOCDIR) | 82 | install -m 0755 -d $(DESTDIR)/$(DOCDIR) |
81 | install -c -m 0644 COPYING $(DESTDIR)/$(DOCDIR)/. | 83 | install -c -m 0644 COPYING $(DESTDIR)/$(DOCDIR)/. |
@@ -124,6 +126,8 @@ install-strip: all | |||
124 | strip src/libconnect/libconnect.so | 126 | strip src/libconnect/libconnect.so |
125 | strip src/ftee/ftee | 127 | strip src/ftee/ftee |
126 | strip src/faudit/faudit | 128 | strip src/faudit/faudit |
129 | strip src/fnet/fnet | ||
130 | strip src/fseccomp/fseccomp | ||
127 | $(MAKE) realinstall | 131 | $(MAKE) realinstall |
128 | 132 | ||
129 | uninstall: | 133 | uninstall: |
@@ -141,7 +145,7 @@ uninstall: | |||
141 | rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg | 145 | rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg |
142 | 146 | ||
143 | DISTFILES = "src etc platform configure configure.ac Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh mkuid.sh COPYING README RELNOTES" | 147 | DISTFILES = "src etc platform configure configure.ac Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh mkuid.sh COPYING README RELNOTES" |
144 | DISTFILES_TEST = "test/apps test/apps-x11 test/environment test/profiles test/utils test/compile test/filters test/network test/fs test/sysutils" | 148 | DISTFILES_TEST = "test/apps test/apps-x11 test/apps-x11-xorg test/environment test/profiles test/utils test/compile test/filters test/network test/fs test/sysutils" |
145 | 149 | ||
146 | dist: | 150 | dist: |
147 | mv config.status config.status.old | 151 | mv config.status config.status.old |
@@ -195,6 +199,9 @@ test-apps: | |||
195 | test-apps-x11: | 199 | test-apps-x11: |
196 | cd test/apps-x11; ./apps-x11.sh | grep TESTING | 200 | cd test/apps-x11; ./apps-x11.sh | grep TESTING |
197 | 201 | ||
202 | test-apps-x11-xorg: | ||
203 | cd test/apps-x11-xorg; ./apps-x11-xorg.sh | grep TESTING | ||
204 | |||
198 | test-sysutils: | 205 | test-sysutils: |
199 | cd test/sysutils; ./sysutils.sh | grep TESTING | 206 | cd test/sysutils; ./sysutils.sh | grep TESTING |
200 | 207 | ||
@@ -213,5 +220,5 @@ test-network: | |||
213 | test-fs: | 220 | test-fs: |
214 | cd test/fs; ./fs.sh | grep TESTING | 221 | cd test/fs; ./fs.sh | grep TESTING |
215 | 222 | ||
216 | test: test-profiles test-fs test-utils test-environment test-apps test-apps-x11 test-filters | 223 | test: test-profiles test-fs test-utils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters |
217 | echo "TEST COMPLETE" | 224 | echo "TEST COMPLETE" |