mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-08-29 13:28:19 +00:00
- Had to add dbus-glib-lowlevel.h header to build on 10.3
- Cleaned up the install part of the makefile
This commit is contained in:
Matt Barringer
parent
3fa1810e26
commit
306ef1c9a8
@ -6,29 +6,6 @@ EXTRA_DIST = \
|
||||
autogen.sh \
|
||||
AppArmor_Monitor_Factory.server.in
|
||||
|
||||
|
||||
install-data-local:
|
||||
@$(NORMAL_INSTALL)
|
||||
if test -d $(srcdir)/pixmaps; then \
|
||||
$(mkinstalldirs) $(DESTDIR)/pixmaps; \
|
||||
for pixmap in $(srcdir)/pixmaps/*; do \
|
||||
if test -f $$pixmap; then \
|
||||
$(INSTALL_DATA) $$pixmap $(pixmapsdir); \
|
||||
fi \
|
||||
done \
|
||||
fi
|
||||
|
||||
dist-hook:
|
||||
if test -d pixmaps; then \
|
||||
mkdir $(distdir)/pixmaps; \
|
||||
for pixmap in pixmaps/*; do \
|
||||
if test -f $$pixmap; then \
|
||||
cp -p $$pixmap $(distdir)/pixmaps; \
|
||||
fi \
|
||||
done \
|
||||
fi
|
||||
|
||||
|
||||
serverdir = $(libdir)/bonobo/servers
|
||||
server_in_files = AppArmor_Monitor_Factory.server.in
|
||||
server_DATA = AppArmor_Monitor_Factory.server
|
||||
|
||||
@ -472,9 +472,6 @@ distdir: $(DISTFILES)
|
||||
|| exit 1; \
|
||||
fi; \
|
||||
done
|
||||
$(MAKE) $(AM_MAKEFLAGS) \
|
||||
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||
dist-hook
|
||||
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
||||
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
||||
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
||||
@ -624,7 +621,7 @@ info: info-recursive
|
||||
|
||||
info-am:
|
||||
|
||||
install-data-am: install-data-local install-serverDATA
|
||||
install-data-am: install-serverDATA
|
||||
|
||||
install-exec-am:
|
||||
|
||||
@ -659,41 +656,19 @@ uninstall-info: uninstall-info-recursive
|
||||
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
|
||||
check-am clean clean-generic clean-libtool clean-recursive \
|
||||
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
|
||||
dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
|
||||
dist-shar dist-tarZ dist-zip distcheck distclean \
|
||||
distclean-generic distclean-hdr distclean-libtool \
|
||||
distclean-recursive distclean-tags distcleancheck distdir \
|
||||
distuninstallcheck dvi dvi-am html html-am info info-am \
|
||||
install install-am install-data install-data-am \
|
||||
install-data-local install-exec install-exec-am install-info \
|
||||
install-info-am install-man install-serverDATA install-strip \
|
||||
installcheck installcheck-am installdirs installdirs-am \
|
||||
maintainer-clean maintainer-clean-generic \
|
||||
maintainer-clean-recursive mostlyclean mostlyclean-generic \
|
||||
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
|
||||
tags tags-recursive uninstall uninstall-am uninstall-info-am \
|
||||
uninstall-serverDATA
|
||||
install install-am install-data install-data-am install-exec \
|
||||
install-exec-am install-info install-info-am install-man \
|
||||
install-serverDATA install-strip installcheck installcheck-am \
|
||||
installdirs installdirs-am maintainer-clean \
|
||||
maintainer-clean-generic maintainer-clean-recursive \
|
||||
mostlyclean mostlyclean-generic mostlyclean-libtool \
|
||||
mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
|
||||
uninstall uninstall-am uninstall-info-am uninstall-serverDATA
|
||||
|
||||
|
||||
install-data-local:
|
||||
@$(NORMAL_INSTALL)
|
||||
if test -d $(srcdir)/pixmaps; then \
|
||||
$(mkinstalldirs) $(DESTDIR)/pixmaps; \
|
||||
for pixmap in $(srcdir)/pixmaps/*; do \
|
||||
if test -f $$pixmap; then \
|
||||
$(INSTALL_DATA) $$pixmap $(pixmapsdir); \
|
||||
fi \
|
||||
done \
|
||||
fi
|
||||
|
||||
dist-hook:
|
||||
if test -d pixmaps; then \
|
||||
mkdir $(distdir)/pixmaps; \
|
||||
for pixmap in pixmaps/*; do \
|
||||
if test -f $$pixmap; then \
|
||||
cp -p $$pixmap $(distdir)/pixmaps; \
|
||||
fi \
|
||||
done \
|
||||
fi
|
||||
AppArmor_Monitor_Factory.server:
|
||||
sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" < AppArmor_Monitor_Factory.server.in > AppArmor_Monitor_Factory.server
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
|
||||
@ -14,6 +14,8 @@ Group: System/GUI/Gnome
|
||||
Requires: apparmor-dbus
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Summary: An AppArmor event notification applet for GNOME
|
||||
License: GPL
|
||||
|
||||
%description
|
||||
-
|
||||
@ -38,6 +40,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%doc AUTHORS COPYING ChangeLog NEWS README
|
||||
%{_libdir}/bonobo/servers/*.server
|
||||
%{_prefix}/lib/apparmorapplet
|
||||
%{_datadir}/pixmaps/*
|
||||
|
||||
%changelog
|
||||
-
|
||||
|
||||
@ -165,7 +165,7 @@ includedir = ${prefix}/include
|
||||
infodir = ${datarootdir}/info
|
||||
install_sh = /home/work/forge/trunk/management/applets/apparmorapplet-gnome/install-sh
|
||||
libdir = ${exec_prefix}/lib
|
||||
libexecdir = /usr/lib/apparmorapplet
|
||||
libexecdir = ${exec_prefix}/libexec
|
||||
localedir = ${datarootdir}/locale
|
||||
localstatedir = ${prefix}/var
|
||||
mandir = ${datarootdir}/man
|
||||
@ -180,7 +180,7 @@ sbindir = ${exec_prefix}/sbin
|
||||
sharedstatedir = ${prefix}/com
|
||||
sysconfdir = ${prefix}/etc
|
||||
target_alias =
|
||||
apparmor_applet_pixmapsdir = $(prefix)/@NO_PREFIX_PACKAGE_PIXMAPS_DIR@
|
||||
apparmor_applet_pixmapsdir = $(pixmapsdir)
|
||||
apparmor_applet_pixmaps_DATA = \
|
||||
apparmor_alert.png apparmor_default.png
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
apparmor_applet_pixmapsdir = $(prefix)/@NO_PREFIX_PACKAGE_PIXMAPS_DIR@
|
||||
apparmor_applet_pixmapsdir = $(pixmapsdir)
|
||||
|
||||
apparmor_applet_pixmaps_DATA = \
|
||||
apparmor_alert.png apparmor_default.png
|
||||
|
||||
@ -180,7 +180,7 @@ sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
apparmor_applet_pixmapsdir = $(prefix)/@NO_PREFIX_PACKAGE_PIXMAPS_DIR@
|
||||
apparmor_applet_pixmapsdir = $(pixmapsdir)
|
||||
apparmor_applet_pixmaps_DATA = \
|
||||
apparmor_alert.png apparmor_default.png
|
||||
|
||||
|
||||
@ -6,8 +6,10 @@
|
||||
#include <panel-applet.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <dbus/dbus.h>
|
||||
#include <dbus/dbus-glib-lowlevel.h>
|
||||
#include <regex.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <glib/gi18n.h>
|
||||
#include "preferences_dialog.h"
|
||||
#include "reject_list.h"
|
||||
@ -285,7 +287,7 @@ void applet_about(BonoboUIComponent * uic)
|
||||
g_object_new(GTK_TYPE_ABOUT_DIALOG,
|
||||
"authors", authors,
|
||||
"logo", GDK_PIXBUF(apparmor_applet->icon),
|
||||
"copyright", ("Copyright (C) 2006 Novell"),
|
||||
"copyright", ("Copyright (C) 2007 Novell"),
|
||||
"name", ("AppArmor Alert Applet"),
|
||||
"version", VERSION,
|
||||
"license", license,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user