depend on EggDBus HEAD for stamp file and Docbook docs for D-Bus interfaces

make -j4 should work now

diff --git a/docs/polkit/Makefile.am b/docs/polkit/Makefile.am
index 3660163..bf4f909 100644 (file)
--- a/docs/polkit/Makefile.am
+++ b/docs/polkit/Makefile.am
@@ -47,8 +47,13 @@ MKDB_OPTIONS=--sgml-mode --output-format=xml
 MKTMPL_OPTIONS=
 
 # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
-content_files =                                \
-       ../version.xml                          \
+content_files =                                                                                        \
+       ../version.xml                                                                                  \
+       ../../src/polkit/docbook-interface-org.freedesktop.PolicyKit1.Authority.xml                     \
+       ../../src/polkit/docbook-interface-org.freedesktop.PolicyKit1.AuthorityManager.xml              \
+       ../../src/polkitagent/docbook-interface-org.freedesktop.PolicyKit1.AuthenticationAgent.xml      \
+       ../man/PolicyKit.xml                                                                            \
+       ../man/polkit.xml                                                                               \
        $(NULL)
 
 # Images to copy into HTML directory

diff --git a/docs/polkit/polkit-docs.xml b/docs/polkit/polkit-docs.xml
index 5488f75..07f118f 100644 (file)
--- a/docs/polkit/polkit-docs.xml
+++ b/docs/polkit/polkit-docs.xml
@@ -55,6 +55,13 @@
     </legalnotice>
   </bookinfo>
 
+  <reference id="ref-dbus-api">
+    <title>D-Bus API Reference</title>
+    <xi:include href="../../src/polkit/docbook-interface-org.freedesktop.PolicyKit1.Authority.xml"/>
+    <xi:include href="../../src/polkit/docbook-interface-org.freedesktop.PolicyKit1.AuthorityManager.xml"/>
+    <xi:include href="../../src/polkitagent/docbook-interface-org.freedesktop.PolicyKit1.AuthenticationAgent.xml"/>
+  </reference>
+
   <reference id="ref-api">
     <title>Core API Reference</title>
     <xi:include href="xml/polkitauthority.xml"/>

diff --git a/src/polkit/Makefile.am b/src/polkit/Makefile.am
index 61233ee..1345d9d 100644 (file)
--- a/src/polkit/Makefile.am
+++ b/src/polkit/Makefile.am
@@ -15,29 +15,22 @@ INCLUDES =                                                      \
        -DEGG_DBUS_I_KNOW_API_IS_SUBJECT_TO_CHANGE              \
         $(NULL)
 
-BUILT_SOURCES =                                                                                \
-       _polkitactiondescription.c              _polkitactiondescription.h              \
-       _polkitauthority.c                      _polkitauthority.h                      \
-       _polkitauthoritymanager.c               _polkitauthoritymanager.h               \
-       _polkitauthorization.c                  _polkitauthorization.h                  \
-       _polkitauthorizationresult.c            _polkitauthorizationresult.h            \
-       _polkitimplicitauthorization.c          _polkitimplicitauthorization.h          \
-       _polkitcheckauthorizationflags.c        _polkitcheckauthorizationflags.h        \
-       _polkitbindings.c                       _polkitbindings.h                       \
-       _polkitbindingsmarshal.c                _polkitbindingsmarshal.h                \
-       _polkitbindingstypes.h                                                          \
-       _polkiterror.c                          _polkiterror.h                          \
-       _polkitsubject.c                        _polkitsubject.h                        \
-       _polkitidentity.c                       _polkitidentity.h                       \
+BUILT_SOURCES =                                                \
+       authority-built-sources.stamp                           \
        $(NULL)
 
-$(BUILT_SOURCES) : Makefile.am $(top_srcdir)/data/org.freedesktop.PolicyKit1.Authority.xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthorityManager.xml
+authority-built-sources.stamp : Makefile.am $(top_srcdir)/data/org.freedesktop.PolicyKit1.Authority.xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthorityManager.xml
        eggdbus-binding-tool                                                                            \
-         --namespace       "_Polkit"                                                                   \
-         --dbus-namespace  "org.freedesktop.PolicyKit1"                                                \
-         --introspection-xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.Authority.xml               \
-         --introspection-xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthorityManager.xml        \
-         $(NULL)
+               --namespace "_Polkit"                                                                   \
+               --dbus-namespace "org.freedesktop.PolicyKit1"                                           \
+               --introspection-xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.Authority.xml         \
+               --introspection-xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthorityManager.xml  \
+               --stamp-file authority-built-sources.stamp                                              \
+       $(NULL)
+
+# keep in sync with contents of authority-built-sources.stamp (Thanks autotools)
+#
+authority_built_sources = _polkitbindingsmarshal.c _polkitbindingsmarshal.h _polkitbindingsmarshal.list _polkitbindings.c _polkitbindings.h _polkitbindingstypes.h _polkitauthoritymanager.c _polkitauthoritymanager.h docbook-interface-org.freedesktop.PolicyKit1.AuthorityManager.xml _polkitauthority.c _polkitauthority.h docbook-interface-org.freedesktop.PolicyKit1.Authority.xml _polkitcheckauthorizationflags.c _polkitcheckauthorizationflags.h _polkitauthorizationresult.c _polkitauthorizationresult.h _polkiterror.c _polkiterror.h _polkitimplicitauthorization.c _polkitimplicitauthorization.h _polkitauthorization.c _polkitauthorization.h _polkitactiondescription.c _polkitactiondescription.h _polkitidentity.c _polkitidentity.h _polkitsubject.c _polkitsubject.h
 
 lib_LTLIBRARIES=libpolkit-gobject-1.la
 
@@ -65,8 +58,9 @@ libpolkit_gobject_1include_HEADERS =                                                  \
         $(NULL)
 
 libpolkit_gobject_1_la_SOURCES =                                                       \
+       $(BUILT_SOURCES)                                                                \
+       $(authority_built_sources)                                                      \
         polkit.h                                                                       \
-        $(BUILT_SOURCES)                                                               \
        polkitactiondescription.c               polkitactiondescription.h               \
        polkitauthority.c                       polkitauthority.h                       \
        polkitauthoritymanager.c                polkitauthoritymanager.h                \
@@ -95,7 +89,9 @@ libpolkit_gobject_1_la_LIBADD =                                               \
         $(EGG_DBUS_LIBS)                                               \
         $(NULL)
 
-CLEANFILES = $(BUILT_SOURCES)
+dist-hook :
+       (for i in $(authority_built_sources) $(BUILT_SOURCES) ; do rm -f $(distdir)/$$i ; done)
 
 clean-local :
-       rm -f *~
+       rm -f *~ $(authority_built_sources) $(BUILT_SOURCES)
+

diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
index 0acdc7f..1ecfef5 100644 (file)
--- a/src/polkitagent/Makefile.am
+++ b/src/polkitagent/Makefile.am
@@ -16,30 +16,29 @@ INCLUDES =                                                      \
        -DEGG_DBUS_I_KNOW_API_IS_SUBJECT_TO_CHANGE              \
         $(NULL)
 
-BUILT_SOURCES =                                                                                        \
-       _polkitagentauthenticationagent.c               _polkitagentauthenticationagent.h       \
-       _polkitagentbindings.c                          _polkitagentbindings.h                  \
-       _polkitagentbindingsmarshal.list                                                        \
-       _polkitagentbindingsmarshal.c                   _polkitagentbindingsmarshal.h           \
-       _polkitagentbindingstypes.h                                                             \
+BUILT_SOURCES =                                                \
+       marshal.stamp                                           \
+       agent-built-sources.stamp                               \
        $(NULL)
 
-$(BUILT_SOURCES) : Makefile.am $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml
+agent-built-sources.stamp : Makefile.am $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml
        eggdbus-binding-tool                                                                            \
          --namespace       "_PolkitAgent"                                                              \
          --dbus-namespace  "org.freedesktop.PolicyKit1"                                                \
          --introspection-xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml     \
+         --stamp-file agent-built-sources.stamp                                                        \
          $(NULL)
 
-BUILT_SOURCES +=                                               \
-       polkitagentmarshal.h            polkitagentmarshal.c    \
-       $(NULL)
+# keep in sync with contents of agent-built-sources.stamp (Thanks autotools)
+#
+agent_built_sources = _polkitagentbindingsmarshal.c _polkitagentbindingsmarshal.h _polkitagentbindingsmarshal.list _polkitagentbindings.c _polkitagentbindings.h _polkitagentbindingstypes.h _polkitagentauthenticationagent.c _polkitagentauthenticationagent.h docbook-interface-org.freedesktop.PolicyKit1.AuthenticationAgent.xml
 
-polkitagentmarshal.h : polkitagentmarshal.list
-       glib-genmarshal --prefix=polkit_agent_marshal $(srcdir)/polkitagentmarshal.list --header > $@.tmp && mv $@.tmp $@
+marshal.stamp : Makefile.am $(srcdir)/polkitagentmarshal.list
+       glib-genmarshal --prefix=polkit_agent_marshal $(srcdir)/polkitagentmarshal.list --header > polkitagentmarshal.h.tmp && mv polkitagentmarshal.h.tmp polkitagentmarshal.h
+       (echo "#include \"polkitagentmarshal.h\""; glib-genmarshal --prefix=polkit_agent_marshal $(srcdir)/polkitagentmarshal.list --body) > polkitagentmarshal.c.tmp && mv polkitagentmarshal.c.tmp polkitagentmarshal.c
+       touch marshal.stamp
 
-polkitagentmarshal.c: polkitagentmarshal.h polkitagentmarshal.list
-       (echo "#include \"polkitagentmarshal.h\""; glib-genmarshal --prefix=polkit_agent_marshal $(srcdir)/polkitagentmarshal.list --body) > $@.tmp && mv $@.tmp $@
+marshal_built_sources = polkitagentmarshal.h polkitagentmarshal.c
 
 lib_LTLIBRARIES=libpolkit-agent-1.la
 
@@ -53,11 +52,13 @@ libpolkit_agent_1include_HEADERS =                                                  \
         $(NULL)
 
 libpolkit_agent_1_la_SOURCES =                                                         \
+       $(BUILT_SOURCES)                                                                \
+       $(agent_built_sources)                                                          \
+       $(marshal_built_sources)                                                        \
         polkitagent.h                                                                  \
        polkitagenttypes.h                                                              \
        polkitagentsession.h                    polkitagentsession.c                    \
        polkitagentlistener.h                   polkitagentlistener.c                   \
-       $(BUILT_SOURCES)                                                                \
         $(NULL)
 
 libpolkit_agent_1_la_CFLAGS =                                          \
@@ -86,9 +87,10 @@ install-exec-hook:
        -chown root $(DESTDIR)$(libexecdir)/polkit-agent-helper-1
        -chmod 4755 $(DESTDIR)$(libexecdir)/polkit-agent-helper-1
 
-CLEANFILES = $(BUILT_SOURCES)
-
 EXTRA_DIST = polkitagentmarshal.list
 
+dist-hook :
+       (for i in $(agent_built_sources) $(marshal_built_sources) $(BUILT_SOURCES) ; do rm -f $(distdir)/$$i ; done)
+
 clean-local :
-       rm -f *~
+       rm -f *~ $(agent_built_sources) $(marshal_built_sources) $(BUILT_SOURCES)

diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am
index 156ffd6..6cc2c84 100644 (file)
--- a/src/polkitbackend/Makefile.am
+++ b/src/polkitbackend/Makefile.am
@@ -15,35 +15,35 @@ INCLUDES =                                                      \
        -DEGG_DBUS_I_KNOW_API_IS_SUBJECT_TO_CHANGE              \
         $(NULL)
 
-BUILT_SOURCES =                                                                                        \
-       ckmanager.c                                     ckmanager.h                             \
-       cksession.c                                     cksession.h                             \
-       ckseat.c                                        ckseat.h                                \
-       ckdevice.c                                      ckdevice.h                              \
-       ckbindings.c                                    ckbindings.h                            \
-       ckbindingsmarshal.list                                                                  \
-       ckbindingsmarshal.c                             ckbindingsmarshal.h                     \
-       ckbindingstypes.h                                                                       \
-       ckerror.c                                       ckerror.h                               \
-       _polkitagentauthenticationagent.c               _polkitagentauthenticationagent.h       \
-       _polkitagentbindings.c                          _polkitagentbindings.h                  \
-       _polkitagentbindingsmarshal.list                                                        \
-       _polkitagentbindingsmarshal.c                   _polkitagentbindingsmarshal.h           \
-       _polkitagentbindingstypes.h                                                             \
+BUILT_SOURCES =                                                \
+       agent-built-sources.stamp                               \
+       ck-built-sources.stamp                                  \
        $(NULL)
 
-$(BUILT_SOURCES) : Makefile.am $(top_srcdir)/src/polkitbackend/org.freedesktop.ConsoleKit.xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml
+ck-built-sources.stamp : Makefile.am $(srcdir)/org.freedesktop.ConsoleKit.xml
        eggdbus-binding-tool                                                                            \
          --namespace       "Ck"                                                                        \
          --dbus-namespace  "org.freedesktop.ConsoleKit"                                                \
          --introspection-xml $(top_srcdir)/src/polkitbackend/org.freedesktop.ConsoleKit.xml            \
+         --stamp-file ck-built-sources.stamp                                                           \
          $(NULL)
+
+agent-built-sources.stamp : Makefile.am $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml
        eggdbus-binding-tool                                                                            \
          --namespace       "_PolkitAgent"                                                              \
          --dbus-namespace  "org.freedesktop.PolicyKit1"                                                \
          --introspection-xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml     \
+         --stamp-file agent-built-sources.stamp                                                        \
          $(NULL)
 
+# keep in sync with contents of ck-built-sources.stamp (Thanks autotools)
+#
+ck_built_sources = ckbindingsmarshal.c ckbindingsmarshal.h ckbindingsmarshal.list ckbindings.c ckbindings.h ckbindingstypes.h cksession.c cksession.h docbook-interface-org.freedesktop.ConsoleKit.Session.xml ckseat.c ckseat.h docbook-interface-org.freedesktop.ConsoleKit.Seat.xml ckmanager.c ckmanager.h docbook-interface-org.freedesktop.ConsoleKit.Manager.xml ckerror.c ckerror.h ckdevice.c ckdevice.h
+
+# keep in sync with contents of agent-built-sources.stamp (Thanks autotools)
+#
+agent_built_sources = _polkitagentbindingsmarshal.c _polkitagentbindingsmarshal.h _polkitagentbindingsmarshal.list _polkitagentbindings.c _polkitagentbindings.h _polkitagentbindingstypes.h _polkitagentauthenticationagent.c _polkitagentauthenticationagent.h docbook-interface-org.freedesktop.PolicyKit1.AuthenticationAgent.xml
+
 lib_LTLIBRARIES=libpolkit-backend-1.la
 
 libpolkit_backend_1includedir=$(includedir)/polkit-1/polkitbackend
@@ -58,6 +58,9 @@ libpolkit_backend_1include_HEADERS =                                  \
         $(NULL)
 
 libpolkit_backend_1_la_SOURCES =                                       \
+       $(ck_built_sources)                                             \
+       $(agent_built_sources)                                          \
+       $(BUILT_SOURCES)                                                \
         polkitbackend.h                                                        \
        polkitbackendtypes.h                                            \
        polkitbackendprivate.h                                          \
@@ -65,7 +68,6 @@ libpolkit_backend_1_la_SOURCES =                                      \
        polkitbackendlocalauthority.h   polkitbackendlocalauthority.c   \
        polkitbackendactionpool.h       polkitbackendactionpool.c       \
        polkitbackendsessionmonitor.h   polkitbackendsessionmonitor.c   \
-       $(BUILT_SOURCES)                                                \
         $(NULL)
 
 libpolkit_backend_1_la_CFLAGS =                                                \
@@ -87,8 +89,11 @@ EXTRA_DIST =                                                         \
        org.freedesktop.ConsoleKit.xml                                  \
        $(NULL)
 
+dist-hook :
+       (for i in $(ck_built_sources) $(agent_built_sources) $(BUILT_SOURCES) ; do rm -f $(distdir)/$$i ; done)
+
 clean-local :
-       rm -f *~
+       rm -f *~ $(ck_built_sources) $(agent_built_sources) $(BUILT_SOURCES)
 
 install-exec-hook:
        mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1