aboutsummaryrefslogtreecommitdiffstats
path: root/src/firecfg
diff options
context:
space:
mode:
authorLibravatar smitsohu <smitsohu@gmail.com>2018-03-24 17:12:01 +0100
committerLibravatar smitsohu <smitsohu@gmail.com>2018-03-24 17:12:01 +0100
commitba1fc01cb77573a205e88d4d5c786398384382c7 (patch)
tree76e1eca9fdd598b8f9fa3d288727c22f0e83961a /src/firecfg
parentadd basic akonadi integration (diff)
parentFixup gnome-recipes and add it to firecfg (diff)
downloadfirejail-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.in3
-rw-r--r--src/firecfg/firecfg.config1
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@
19HAVE_FILE_TRANSFER=@HAVE_FILE_TRANSFER@ 19HAVE_FILE_TRANSFER=@HAVE_FILE_TRANSFER@
20HAVE_GCOV=@HAVE_GCOV@ 20HAVE_GCOV=@HAVE_GCOV@
21EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ 21EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@
22EXTRA_CFLAGS +=@EXTRA_CFLAGS@
22 23
23 24
24H_FILE_LIST = $(sort $(wildcard *.[h])) 25H_FILE_LIST = $(sort $(wildcard *.[h]))
@@ -29,7 +30,7 @@ CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV)
29LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread 30LDFLAGS += -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
34firecfg: $(OBJS) ../lib/common.o 35firecfg: $(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
155gnome-mplayer 155gnome-mplayer
156gnome-music 156gnome-music
157gnome-photos 157gnome-photos
158gnome-recipes
158gnome-twitch 159gnome-twitch
159gnome-weather 160gnome-weather
160goobox 161goobox