Commit d973961d authored by David Zeuthen's avatar David Zeuthen
Browse files

Move polkitd into src/polkitbackend


Signed-off-by: default avatarDavid Zeuthen <davidz@redhat.com>
parent 1caa8c2d
......@@ -458,7 +458,6 @@ src/Makefile
src/polkit/Makefile
src/polkitbackend/Makefile
src/polkitagent/Makefile
src/polkitd/Makefile
src/programs/Makefile
src/examples/Makefile
docs/version.xml
......
SUBDIRS = polkit polkitbackend polkitagent polkitd programs
SUBDIRS = polkit polkitbackend polkitagent programs
if BUILD_EXAMPLES
SUBDIRS += examples
......
......@@ -65,6 +65,31 @@ libpolkit_backend_1_la_LIBADD = \
rulesdir = $(sysconfdir)/polkit-1/rules.d
rules_DATA = 50-default.rules
# ----------------------------------------------------------------------------------------------------
libprivdir = $(prefix)/lib/polkit-1
libpriv_PROGRAMS = polkitd
polkitd_SOURCES = \
polkitd.c \
$(NULL)
polkitd_CFLAGS = \
-DPOLKIT_BACKEND_I_KNOW_API_IS_SUBJECT_TO_CHANGE \
-DG_LOG_DOMAIN=\"polkitd-1\" \
$(GLIB_CFLAGS) \
$(NULL)
polkitd_LDADD = \
$(DBUS_GLIB_LIBS) \
$(GLIB_LIBS) \
$(top_builddir)/src/polkit/libpolkit-gobject-1.la \
$(top_builddir)/src/polkitbackend/libpolkit-backend-1.la \
$(NULL)
# ----------------------------------------------------------------------------------------------------
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = \
......
......@@ -113,7 +113,7 @@ main (int argc,
g_type_init ();
opt_context = g_option_context_new ("polkit authority");
opt_context = g_option_context_new ("polkit system daemon");
g_option_context_add_main_entries (opt_context, opt_entries, NULL);
error = NULL;
if (!g_option_context_parse (opt_context, &argc, &argv, &error))
......
NULL =
INCLUDES = \
-I$(top_builddir)/src \
-I$(top_srcdir)/src \
-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
-DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-DPACKAGE_LIB_DIR=\""$(libdir)"\" \
-D_POSIX_PTHREAD_SEMANTICS \
-D_REENTRANT \
$(NULL)
libprivdir = $(prefix)/lib/polkit-1
libpriv_PROGRAMS = polkitd
polkitd_SOURCES = \
main.c \
$(NULL)
polkitd_CFLAGS = \
-DPOLKIT_BACKEND_I_KNOW_API_IS_SUBJECT_TO_CHANGE \
-DG_LOG_DOMAIN=\"polkitd-1\" \
$(GLIB_CFLAGS) \
$(NULL)
polkitd_LDADD = \
$(DBUS_GLIB_LIBS) \
$(GLIB_LIBS) \
$(top_builddir)/src/polkit/libpolkit-gobject-1.la \
$(top_builddir)/src/polkitbackend/libpolkit-backend-1.la \
$(NULL)
CLEANFILES = $(BUILT_SOURCES)
clean-local :
rm -f *~
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment