diff options
author | Eric Koegel <eric.koegel@gmail.com> | 2017-05-14 05:17:31 +0300 |
---|---|---|
committer | Eric Koegel <eric.koegel@gmail.com> | 2017-05-21 01:59:53 +0300 |
commit | 7b2d543880263c4c7f1fc09a9959a254efe0d1c4 (patch) | |
tree | 9278c6b2cf65c3563502dda6057c21ad01a36d64 /src | |
parent | 4fed37113499fe999bf0c0f171e57215305aba27 (diff) | |
download | ConsoleKit2-7b2d543880263c4c7f1fc09a9959a254efe0d1c4.tar.gz |
chore: simplify configure.ac
Pull in the m4 macros from the xfce4-dev-tools so
we have ways to simplify and shorten the configure.ac
file.
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 93059dc..9e342ef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,11 +9,18 @@ SUBDIRS = \ AM_CFLAGS = \ -I. \ -I$(srcdir) \ - -U_FORTIFY_SOURCE \ - $(CONSOLE_KIT_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ + $(GIO_UNIX_CFLAGS) \ $(POLKIT_CFLAGS) \ + $(LIBDBUS_CFLAGS) \ $(CGMANAGER_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) \ + $(LIBUDEV_CFLAGS) \ + $(LIBDRM_CFLAGS) \ + $(SELINUX_CFLAGS) \ + $(LIBEVDEV_CFLAGS) \ + $(RBAC_CFLAGS) \ + $(LIBX11_CFLAGS) \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ -DLIBDIR=\""$(libdir)"\" \ @@ -24,13 +31,24 @@ AM_CFLAGS = \ -DRUNDIR=\""$(RUNDIR)"\" \ -DCONSOLE_KIT_PID_FILE=\""$(CONSOLE_KIT_PID_FILE)"\" \ -DLOCALEDIR=\"$(localedir)\" \ - $(WARN_CFLAGS) \ - $(DEBUG_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(LIBUDEV_CFLAGS) \ - $(LIBDRM_CFLAGS) \ $(NULL) +CONSOLE_KIT_LIBS = \ + $(CK2_LIBS) \ + $(GLIB_LIBS) \ + $(GIO_LIBS) \ + $(GIO_UNIX_LIBS) \ + $(LIBDBUS_LIBS) \ + $(SELINUX_LIBS) \ + $(LIBEVDEV_LIBS) \ + $(POLKIT_LIBS) \ + $(RBAC_LIBS) \ + $(CGMANAGER_LIBS) \ + $(LIBUDEV_LIBS) \ + $(LIBDRM_LIBS) \ + $(LIBX11_LIBS) + + noinst_LTLIBRARIES = \ libck.la \ libck-event-log.la \ @@ -201,13 +219,8 @@ EXTRA_console_kit_daemon_SOURCES = \ $(NULL) console_kit_daemon_LDADD = \ - $(CONSOLE_KIT_LIBS) \ - $(POLKIT_LIBS) \ - $(RBAC_LIBS) \ - $(CGMANAGER_LIBS) \ - $(LIBUDEV_LIBS) \ - $(LIBDRM_LIBS) \ - libck.la \ + $(CONSOLE_KIT_LIBS) \ + libck.la \ libck-event-log.la \ $(NULL) |