diff options
author | smitsohu <smitsohu@gmail.com> | 2018-03-24 17:12:01 +0100 |
---|---|---|
committer | smitsohu <smitsohu@gmail.com> | 2018-03-24 17:12:01 +0100 |
commit | ba1fc01cb77573a205e88d4d5c786398384382c7 (patch) | |
tree | 76e1eca9fdd598b8f9fa3d288727c22f0e83961a /src/firecfg | |
parent | add basic akonadi integration (diff) | |
parent | Fixup gnome-recipes and add it to firecfg (diff) | |
download | firejail-ba1fc01cb77573a205e88d4d5c786398384382c7.tar.gz firejail-ba1fc01cb77573a205e88d4d5c786398384382c7.tar.zst firejail-ba1fc01cb77573a205e88d4d5c786398384382c7.zip |
Merge branch 'master' of https://github.com/netblue30/firejail
Diffstat (limited to 'src/firecfg')
-rw-r--r-- | src/firecfg/Makefile.in | 3 | ||||
-rw-r--r-- | src/firecfg/firecfg.config | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/firecfg/Makefile.in b/src/firecfg/Makefile.in index 0b2b03275..f0d389e36 100644 --- a/src/firecfg/Makefile.in +++ b/src/firecfg/Makefile.in | |||
@@ -19,6 +19,7 @@ HAVE_X11=@HAVE_X11@ | |||
19 | HAVE_FILE_TRANSFER=@HAVE_FILE_TRANSFER@ | 19 | HAVE_FILE_TRANSFER=@HAVE_FILE_TRANSFER@ |
20 | HAVE_GCOV=@HAVE_GCOV@ | 20 | HAVE_GCOV=@HAVE_GCOV@ |
21 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | 21 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ |
22 | EXTRA_CFLAGS +=@EXTRA_CFLAGS@ | ||
22 | 23 | ||
23 | 24 | ||
24 | H_FILE_LIST = $(sort $(wildcard *.[h])) | 25 | H_FILE_LIST = $(sort $(wildcard *.[h])) |
@@ -29,7 +30,7 @@ CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) | |||
29 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread | 30 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread |
30 | 31 | ||
31 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/euid_common.h ../include/libnetlink.h ../include/pid.h | 32 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/euid_common.h ../include/libnetlink.h ../include/pid.h |
32 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ | 33 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
33 | 34 | ||
34 | firecfg: $(OBJS) ../lib/common.o | 35 | firecfg: $(OBJS) ../lib/common.o |
35 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS) | 36 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS) |
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config index c39c1144e..73510c951 100644 --- a/src/firecfg/firecfg.config +++ b/src/firecfg/firecfg.config | |||
@@ -155,6 +155,7 @@ gnome-maps | |||
155 | gnome-mplayer | 155 | gnome-mplayer |
156 | gnome-music | 156 | gnome-music |
157 | gnome-photos | 157 | gnome-photos |
158 | gnome-recipes | ||
158 | gnome-twitch | 159 | gnome-twitch |
159 | gnome-weather | 160 | gnome-weather |
160 | goobox | 161 | goobox |