Attachment 12346 Details for Bug 13082 – parallel-make.patch

[patch] parallel-make.patch

parallel-make.patch (text/plain), 5.08 KB, created by Ed Catmur on 2007-11-04 11:33:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Catmur

Created: 2007-11-04 11:33:16 UTC

Size: 5.08 KB

patch

obsolete

>--- PolicyKit-0.7/polkit-dbus/Makefile.am	2007/11/04 17:19:41	1.1
>+++ PolicyKit-0.7/polkit-dbus/Makefile.am	2007/11/04 17:20:42
>@@ -32,7 +32,7 @@ libexec_PROGRAMS = polkit-read-auth-help
> 
> polkit_read_auth_helper_SOURCES = polkit-read-auth-helper.c
> polkit_read_auth_helper_CFLAGS = @DBUS_CFLAGS@
>-polkit_read_auth_helper_LDADD = $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la
>+polkit_read_auth_helper_LDADD = $(top_builddir)/polkit/libpolkit.la libpolkit-dbus.la
> 
> # polkit-read-auth-helper needs to be setgid $POLKIT_GROUP to be able
> # to read authorization files in /var/lib/PolicyKit and
>--- PolicyKit-0.7/polkit-grant/Makefile.am	2007/11/04 17:27:52	1.1
>+++ PolicyKit-0.7/polkit-grant/Makefile.am	2007/11/04 17:30:02
>@@ -44,14 +44,14 @@ if POLKIT_AUTHDB_DEFAULT
> libexec_PROGRAMS = polkit-grant-helper polkit-grant-helper-pam polkit-explicit-grant-helper polkit-revoke-helper 
> 
> polkit_grant_helper_SOURCES = polkit-grant-helper.c
>-polkit_grant_helper_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la $(top_builddir)/polkit-grant/libpolkit-grant.la
>+polkit_grant_helper_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la libpolkit-grant.la
> 
> polkit_grant_helper_pam_SOURCES = polkit-grant-helper-pam.c
> polkit_grant_helper_pam_LDADD = @AUTH_LIBS@
> 
> polkit_explicit_grant_helper_SOURCES = polkit-explicit-grant-helper.c
> polkit_explicit_grant_helper_CFLAGS = @DBUS_CFLAGS@
>-polkit_explicit_grant_helper_LDADD = $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la $(top_builddir)/polkit-grant/libpolkit-grant.la
>+polkit_explicit_grant_helper_LDADD = $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la libpolkit-grant.la
> 
> polkit_revoke_helper_SOURCES = polkit-revoke-helper.c
> polkit_revoke_helper_CFLAGS = @DBUS_CFLAGS@
>--- PolicyKit-0.7/gtk-doc.make	2007/11/04 18:07:56	1.1
>+++ PolicyKit-0.7/gtk-doc.make	2007/11/04 18:08:02
>@@ -42,12 +42,19 @@ CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODU
> 
> if ENABLE_GTK_DOC
> all-local: html-build.stamp
>+else
>+all-local:
>+endif
>+
>+docs: html-build.stamp
> 
> #### scan ####
> 
> scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
> 	@echo 'gtk-doc: Scanning header files'
> 	@-chmod -R u+w $(srcdir)
>+	cd $(srcdir) && \
>+	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
> 	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
> 	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
> 	else \
>@@ -56,11 +63,9 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_
>                test -f $$i || touch $$i ; \
> 	    done \
> 	fi
>-	cd $(srcdir) && \
>-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
> 	touch scan-build.stamp
> 
>-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
>+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
> 	@true
> 
> #### templates ####
>@@ -74,9 +79,13 @@ tmpl.stamp: tmpl-build.stamp
> tmpl.stamp: tmpl-build.stamp
> 	@true
> 
>+tmpl/*.sgml:
>+	@true
>+
>+
> #### xml ####
> 
>-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(expand_content_files)
>+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
> 	@echo 'gtk-doc: Building XML'
> 	@-chmod -R u+w $(srcdir)
> 	cd $(srcdir) && \
>@@ -98,16 +107,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_
> 	@echo 'gtk-doc: Fixing cross-references' 
> 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
> 	touch html-build.stamp
>-else
>-all-local:
>-endif
> 
> ##############
> 
> clean-local:
> 	rm -f *~ *.bak
> 	rm -rf .libs
>-	rm -rf tmpl
> 
> maintainer-clean-local: clean
> 	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
>@@ -146,9 +151,9 @@ dist-hook: dist-check-gtkdoc dist-hook-l
> 	mkdir $(distdir)/html
> 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
> 	-cp $(srcdir)/xml/*.xml $(distdir)/xml
>-	-cp $(srcdir)/html/* $(distdir)/html
>+	cp $(srcdir)/html/* $(distdir)/html
> 	if test -f $(srcdir)/$(DOC_MODULE).types; then \
> 	  cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
> 	fi
> 
>-.PHONY : dist-hook-local
>+.PHONY : dist-hook-local docs
>--- PolicyKit-0.7/doc/Makefile.am	2007/11/04 18:40:15	1.1
>+++ PolicyKit-0.7/doc/Makefile.am	2007/11/04 18:41:04
>@@ -29,14 +29,18 @@ IGNORE_HFILES= \
> # CFLAGS and LDFLAGS for compiling scan program. Only needed
> # if $(DOC_MODULE).types is non-empty.
> INCLUDES = \
>+	$(DBUS_GLIB_CFLAGS)	\
> 	$(GLIB_CFLAGS)		\
> 	-I$(top_srcdir) 	\
> 	-I$(top_builddir)	\
> 	$(NULL)
> 
> GTKDOC_LIBS = \
>+	$(DBUS_GLIB_LIBS)			\
> 	$(GLIB_LIBS)				\
> 	$(top_builddir)/polkit/libpolkit.la	\
>+	$(top_builddir)/polkit-dbus/libpolkit-dbus.la	\
>+	$(top_builddir)/polkitd/polkitd-polkit-daemon.o	\
> 	$(NULL)
> 
> # Extra options to supply to gtkdoc-mkdb

Actions: View | Splinter Review

Attachments on bug 13082: 12346 | 12415

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.