chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vala: convert from dbus-glib to gdbus
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 91bcb0f0a47c02bc7b8931511b24a880553f1bf9..47d3ac020306d90816b86e5db5d75ffe5d8be427 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-341,12
+341,6
@@
dist_systemunit_DATA += \
units/fedora/plymouth-halt.service
endif
units/fedora/plymouth-halt.service
endif
-
-if TARGET_ARCH
-dist_systemunit_DATA += \
- units/arch/rc-local.service
-endif
-
dist_doc_DATA = \
README \
LICENSE \
dist_doc_DATA = \
README \
LICENSE \
@@
-826,7
+820,8
@@
systemd_vconsole_setup_LDADD = \
systemd_remount_api_vfs_SOURCES = \
src/remount-api-vfs.c \
systemd_remount_api_vfs_SOURCES = \
src/remount-api-vfs.c \
- src/mount-setup.c
+ src/mount-setup.c \
+ src/exit-status.c
systemd_remount_api_vfs_CFLAGS = \
$(AM_CFLAGS)
systemd_remount_api_vfs_CFLAGS = \
$(AM_CFLAGS)
@@
-938,7
+933,6
@@
systemadm_SOURCES = \
systemadm_CFLAGS = \
$(AM_CFLAGS) \
systemadm_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUSGLIB_CFLAGS) \
$(GTK_CFLAGS) \
-Wno-unused-variable \
-Wno-unused-function \
$(GTK_CFLAGS) \
-Wno-unused-variable \
-Wno-unused-function \
@@
-946,13
+940,11
@@
systemadm_CFLAGS = \
-Wno-format-nonliteral
systemadm_VALAFLAGS = \
-Wno-format-nonliteral
systemadm_VALAFLAGS = \
- --pkg=dbus-glib-1 \
--pkg=posix \
--pkg=gtk+-2.0 \
-g
systemadm_LDADD = \
--pkg=posix \
--pkg=gtk+-2.0 \
-g
systemadm_LDADD = \
- $(DBUSGLIB_LIBS) \
$(GTK_LIBS)
systemd_gnome_ask_password_agent_SOURCES = \
$(GTK_LIBS)
systemd_gnome_ask_password_agent_SOURCES = \
@@
-960,7
+952,6
@@
systemd_gnome_ask_password_agent_SOURCES = \
systemd_gnome_ask_password_agent_CFLAGS = \
$(AM_CFLAGS) \
systemd_gnome_ask_password_agent_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUSGLIB_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(GTK_CFLAGS) \
-Wno-unused-variable \
$(LIBNOTIFY_CFLAGS) \
$(GTK_CFLAGS) \
-Wno-unused-variable \
@@
-969,7
+960,6
@@
systemd_gnome_ask_password_agent_CFLAGS = \
-Wno-format-nonliteral
systemd_gnome_ask_password_agent_VALAFLAGS = \
-Wno-format-nonliteral
systemd_gnome_ask_password_agent_VALAFLAGS = \
- --pkg=dbus-glib-1 \
--pkg=posix \
--pkg=gtk+-2.0 \
--pkg=linux \
--pkg=posix \
--pkg=gtk+-2.0 \
--pkg=linux \
@@
-983,7
+973,6
@@
systemd_gnome_ask_password_agent_VALAFLAGS += \
-g
systemd_gnome_ask_password_agent_LDADD = \
-g
systemd_gnome_ask_password_agent_LDADD = \
- $(DBUSGLIB_LIBS) \
$(LIBNOTIFY_LIBS) \
$(GTK_LIBS)
$(LIBNOTIFY_LIBS) \
$(GTK_LIBS)