chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gnome-ask-password-agent: require libnotify >= 0.7.0
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 5792c8eec565e57f94db6c2236d412bd8335ee67..0d34fb31bbe05b0942b95fcee563c8cceec514be 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-69,6
+69,8
@@
INSTALL_EXEC_HOOKS =
UNINSTALL_EXEC_HOOKS =
INSTALL_DATA_HOOKS =
pkginclude_HEADERS =
UNINSTALL_EXEC_HOOKS =
INSTALL_DATA_HOOKS =
pkginclude_HEADERS =
+lib_LTLIBRARIES =
+pkgconfiglib_DATA =
polkitpolicy_in_files =
AM_CPPFLAGS = \
polkitpolicy_in_files =
AM_CPPFLAGS = \
@@
-132,16
+134,16
@@
AM_CPPFLAGS += \
-DKBD_SETFONT=\"/usr/bin/setfont\" \
-DDEFAULT_FONT=\"LatArCyrHeb-16\"
else
-DKBD_SETFONT=\"/usr/bin/setfont\" \
-DDEFAULT_FONT=\"LatArCyrHeb-16\"
else
+if TARGET_MAGEIA
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-DKBD_SETFONT=\"/bin/setfont\" \
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-DKBD_SETFONT=\"/bin/setfont\" \
- -DDEFAULT_FONT=\"
latarcyrheb-sun
16\"
+ -DDEFAULT_FONT=\"
LatArCyrHeb-
16\"
else
else
-if TARGET_MAGEIA
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-DKBD_SETFONT=\"/bin/setfont\" \
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-DKBD_SETFONT=\"/bin/setfont\" \
- -DDEFAULT_FONT=\"
LatArCyrHeb-
16\"
+ -DDEFAULT_FONT=\"
latarcyrheb-sun
16\"
endif
endif
endif
endif
endif
endif
@@
-205,9
+207,6
@@
systemgenerator_PROGRAMS += \
systemd-cryptsetup-generator
endif
systemd-cryptsetup-generator
endif
-lib_LTLIBRARIES = \
- libsystemd-daemon.la
-
noinst_PROGRAMS = \
test-engine \
test-job-type \
noinst_PROGRAMS = \
test-engine \
test-job-type \
@@
-393,8
+392,6
@@
EXTRA_DIST += \
units/quotacheck.service.in \
units/user@.service.in \
systemd.pc.in \
units/quotacheck.service.in \
units/user@.service.in \
systemd.pc.in \
- libsystemd-daemon.pc.in \
- src/libsystemd-daemon.sym \
introspect.awk \
src/73-seat-late.rules.in \
src/99-systemd.rules.in \
introspect.awk \
src/73-seat-late.rules.in \
src/99-systemd.rules.in \
@@
-467,9
+464,6
@@
dist_doc_DATA = \
pkgconfigdata_DATA = \
systemd.pc
pkgconfigdata_DATA = \
systemd.pc
-pkgconfiglib_DATA = \
- libsystemd-daemon.pc
-
# First passed through sed, followed by intltool
polkitpolicy_in_in_files = \
src/org.freedesktop.systemd1.policy.in.in
# First passed through sed, followed by intltool
polkitpolicy_in_in_files = \
src/org.freedesktop.systemd1.policy.in.in
@@
-1098,12
+1092,7
@@
systemd_gnome_ask_password_agent_VALAFLAGS = \
--pkg=gtk+-2.0 \
--pkg=linux \
--pkg=gio-unix-2.0 \
--pkg=gtk+-2.0 \
--pkg=linux \
--pkg=gio-unix-2.0 \
- --pkg=libnotify
-if LIBNOTIFY07
-systemd_gnome_ask_password_agent_VALAFLAGS += \
- -D LIBNOTIFY07
-endif
-systemd_gnome_ask_password_agent_VALAFLAGS += \
+ --pkg=libnotify \
-g
systemd_gnome_ask_password_agent_LDADD = \
-g
systemd_gnome_ask_password_agent_LDADD = \
@@
-1204,6
+1193,16
@@
libsystemd-daemon-uninstall-hook:
UNINSTALL_EXEC_HOOKS += \
libsystemd-daemon-uninstall-hook
UNINSTALL_EXEC_HOOKS += \
libsystemd-daemon-uninstall-hook
+lib_LTLIBRARIES += \
+ libsystemd-daemon.la
+
+pkgconfiglib_DATA += \
+ libsystemd-daemon.pc
+
+dist_doc_DATA += \
+ src/sd-daemon.h \
+ src/sd-daemon.c
+
MANPAGES += \
man/sd-daemon.7 \
man/sd_notify.3 \
MANPAGES += \
man/sd-daemon.7 \
man/sd_notify.3 \
@@
-1224,12
+1223,10
@@
man/sd_is_socket_inet.3: man/sd_is_fifo.3
man/sd_is_mq.3: man/sd_is_fifo.3
man/sd_notifyf.3: man/sd_notify.3
man/sd_is_mq.3: man/sd_is_fifo.3
man/sd_notifyf.3: man/sd_notify.3
-dist_doc_DATA += \
- src/sd-daemon.h \
- src/sd-daemon.c
-
EXTRA_DIST += \
EXTRA_DIST += \
- ${libsystemd_daemon_la_SOURCES:.c=.h}
+ ${libsystemd_daemon_la_SOURCES:.c=.h} \
+ libsystemd-daemon.pc.in \
+ src/libsystemd-daemon.sym
# ------------------------------------------------------------------------------
libsystemd_id128_la_SOURCES = \
# ------------------------------------------------------------------------------
libsystemd_id128_la_SOURCES = \
@@
-1730,7
+1727,7
@@
libsystemd_login_la_LIBADD = \
if HAVE_PAM
pam_systemd_la_SOURCES = \
if HAVE_PAM
pam_systemd_la_SOURCES = \
- src/pam-module.c \
+ src/
login/
pam-module.c \
src/dbus-common.c
pam_systemd_la_CFLAGS = \
src/dbus-common.c
pam_systemd_la_CFLAGS = \