diff options
| author | David Zeuthen <davidz@redhat.com> | 2012-05-25 11:09:02 -0400 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2012-05-25 11:09:02 -0400 |
| commit | d973961df4aeaf7cf02ec60f9d4167fee2324bf8 (patch) | |
| tree | ca4b586627cd945e2391e07f677f2736c80d20b6 | |
| parent | 1caa8c2d3636bdd99dbbf0c84002946c432bd6e1 (diff) | |
| download | polkit-d973961df4aeaf7cf02ec60f9d4167fee2324bf8.tar.gz | |
Move polkitd into src/polkitbackend
Signed-off-by: David Zeuthen <davidz@redhat.com>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/polkitbackend/Makefile.am | 25 | ||||
| -rw-r--r-- | src/polkitbackend/polkitd.c (renamed from src/polkitd/main.c) | 2 | ||||
| -rw-r--r-- | src/polkitd/Makefile.am | 40 |
5 files changed, 27 insertions, 43 deletions
diff --git a/configure.ac b/configure.ac index 930d8de..d9559cc 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/Makefile.am b/src/Makefile.am index 3380fb2..96c1e0c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = polkit polkitbackend polkitagent polkitd programs +SUBDIRS = polkit polkitbackend polkitagent programs if BUILD_EXAMPLES SUBDIRS += examples diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am index 1bafd94..3f6c043 100644 --- a/src/polkitbackend/Makefile.am +++ b/src/polkitbackend/Makefile.am @@ -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 = \ diff --git a/src/polkitd/main.c b/src/polkitbackend/polkitd.c index f77a12f..0bb3f32 100644 --- a/src/polkitd/main.c +++ b/src/polkitbackend/polkitd.c @@ -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)) diff --git a/src/polkitd/Makefile.am b/src/polkitd/Makefile.am deleted file mode 100644 index 8132fa7..0000000 --- a/src/polkitd/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -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 *~ |