Attachment #135184 for bug #198073

Lines 32-38 libexec_PROGRAMS = polkit-read-auth-help Link Here

(-)PolicyKit-0.7/polkit-dbus/Makefile.am (-1 / +1 lines)
32		32
33	polkit_read_auth_helper_SOURCES = polkit-read-auth-helper.c	33	polkit_read_auth_helper_SOURCES = polkit-read-auth-helper.c
34	polkit_read_auth_helper_CFLAGS = @DBUS_CFLAGS@	34	polkit_read_auth_helper_CFLAGS = @DBUS_CFLAGS@
35	polkit_read_auth_helper_LDADD = $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la	35	polkit_read_auth_helper_LDADD = $(top_builddir)/polkit/libpolkit.la libpolkit-dbus.la
36		36
37	# polkit-read-auth-helper needs to be setgid $POLKIT_GROUP to be able	37	# polkit-read-auth-helper needs to be setgid $POLKIT_GROUP to be able
38	# to read authorization files in /var/lib/PolicyKit and	38	# to read authorization files in /var/lib/PolicyKit and




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 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 libpolkit-grant.la

polkit_revoke_helper_SOURCES = polkit-revoke-helper.c
polkit_revoke_helper_CFLAGS = @DBUS_CFLAGS@

Lines 42-53 CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODU Link Here

(-)PolicyKit-0.7/gtk-doc.make (-10 / +15 lines)
42		42
43	if ENABLE_GTK_DOC	43	if ENABLE_GTK_DOC
44	all-local: html-build.stamp	44	all-local: html-build.stamp
		45	else
		46	all-local:
		47	endif
		48
		49	docs: html-build.stamp
45		50
46	#### scan ####	51	#### scan ####
47		52
48	scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)	53	scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
49	@echo 'gtk-doc: Scanning header files'	54	@echo 'gtk-doc: Scanning header files'
50	@-chmod -R u+w $(srcdir)	55	@-chmod -R u+w $(srcdir)
		56	cd $(srcdir) && \
		57	gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
51	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \	58	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
52	CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \	59	CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
53	else \	60	else \
Lines 56-66 scan-build.stamp: $(HFILE_GLOB) $(CFILE_ Link Here
56	test -f $$i \|\| touch $$i ; \	63	test -f $$i \|\| touch $$i ; \
57	done \	64	done \
58	fi	65	fi
59	cd $(srcdir) && \
60	gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
61	touch scan-build.stamp	66	touch scan-build.stamp
62		67
63	$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp	68	$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
64	@true	69	@true
65		70
66	#### templates ####	71	#### templates ####
Lines 74-82 tmpl.stamp: tmpl-build.stamp Link Here
74	tmpl.stamp: tmpl-build.stamp	79	tmpl.stamp: tmpl-build.stamp
75	@true	80	@true
76		81
		82	tmpl/*.sgml:
		83	@true
		84
		85
77	#### xml ####	86	#### xml ####
78		87
79	sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(expand_content_files)	88	sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
80	@echo 'gtk-doc: Building XML'	89	@echo 'gtk-doc: Building XML'
81	@-chmod -R u+w $(srcdir)	90	@-chmod -R u+w $(srcdir)
82	cd $(srcdir) && \	91	cd $(srcdir) && \
Lines 98-113 html-build.stamp: sgml.stamp $(DOC_MAIN_ Link Here
98	@echo 'gtk-doc: Fixing cross-references'	107	@echo 'gtk-doc: Fixing cross-references'
99	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)	108	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
100	touch html-build.stamp	109	touch html-build.stamp
101	else
102	all-local:
103	endif
104		110
105	##############	111	##############
106		112
107	clean-local:	113	clean-local:
108	rm -f ~ .bak	114	rm -f ~ .bak
109	rm -rf .libs	115	rm -rf .libs
110	rm -rf tmpl
111		116
112	maintainer-clean-local: clean	117	maintainer-clean-local: clean
113	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt	118	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
Lines 146-154 dist-hook: dist-check-gtkdoc dist-hook-l Link Here
146	mkdir $(distdir)/html	151	mkdir $(distdir)/html
147	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl	152	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
148	-cp $(srcdir)/xml/*.xml $(distdir)/xml	153	-cp $(srcdir)/xml/*.xml $(distdir)/xml
149	-cp $(srcdir)/html/* $(distdir)/html	154	cp $(srcdir)/html/* $(distdir)/html
150	if test -f $(srcdir)/$(DOC_MODULE).types; then \	155	if test -f $(srcdir)/$(DOC_MODULE).types; then \
151	cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \	156	cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
152	fi	157	fi
153		158
154	.PHONY : dist-hook-local	159	.PHONY : dist-hook-local docs




# 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

Return to bug 198073

Lines 44-57 if POLKIT_AUTHDB_DEFAULT Link Here

(-)PolicyKit-0.7/polkit-grant/Makefile.am (-2 / +2 lines)
44	libexec_PROGRAMS = polkit-grant-helper polkit-grant-helper-pam polkit-explicit-grant-helper polkit-revoke-helper	44	libexec_PROGRAMS = polkit-grant-helper polkit-grant-helper-pam polkit-explicit-grant-helper polkit-revoke-helper
45		45
46	polkit_grant_helper_SOURCES = polkit-grant-helper.c	46	polkit_grant_helper_SOURCES = polkit-grant-helper.c
47	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	47	polkit_grant_helper_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la libpolkit-grant.la
48		48
49	polkit_grant_helper_pam_SOURCES = polkit-grant-helper-pam.c	49	polkit_grant_helper_pam_SOURCES = polkit-grant-helper-pam.c
50	polkit_grant_helper_pam_LDADD = @AUTH_LIBS@	50	polkit_grant_helper_pam_LDADD = @AUTH_LIBS@
51		51
52	polkit_explicit_grant_helper_SOURCES = polkit-explicit-grant-helper.c	52	polkit_explicit_grant_helper_SOURCES = polkit-explicit-grant-helper.c
53	polkit_explicit_grant_helper_CFLAGS = @DBUS_CFLAGS@	53	polkit_explicit_grant_helper_CFLAGS = @DBUS_CFLAGS@
54	polkit_explicit_grant_helper_LDADD = $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la $(top_builddir)/polkit-grant/libpolkit-grant.la	54	polkit_explicit_grant_helper_LDADD = $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la libpolkit-grant.la
55		55
56	polkit_revoke_helper_SOURCES = polkit-revoke-helper.c	56	polkit_revoke_helper_SOURCES = polkit-revoke-helper.c
57	polkit_revoke_helper_CFLAGS = @DBUS_CFLAGS@	57	polkit_revoke_helper_CFLAGS = @DBUS_CFLAGS@

Lines 29-42 IGNORE_HFILES= \ Link Here

(-)PolicyKit-0.7/doc/Makefile.am (+4 lines)
29	# CFLAGS and LDFLAGS for compiling scan program. Only needed	29	# CFLAGS and LDFLAGS for compiling scan program. Only needed
30	# if $(DOC_MODULE).types is non-empty.	30	# if $(DOC_MODULE).types is non-empty.
31	INCLUDES = \	31	INCLUDES = \
		32	$(DBUS_GLIB_CFLAGS) \
32	$(GLIB_CFLAGS) \	33	$(GLIB_CFLAGS) \
33	-I$(top_srcdir) \	34	-I$(top_srcdir) \
34	-I$(top_builddir) \	35	-I$(top_builddir) \
35	$(NULL)	36	$(NULL)
36		37
37	GTKDOC_LIBS = \	38	GTKDOC_LIBS = \
		39	$(DBUS_GLIB_LIBS) \
38	$(GLIB_LIBS) \	40	$(GLIB_LIBS) \
39	$(top_builddir)/polkit/libpolkit.la \	41	$(top_builddir)/polkit/libpolkit.la \
		42	$(top_builddir)/polkit-dbus/libpolkit-dbus.la \
		43	$(top_builddir)/polkitd/polkitd-polkit-daemon.o \
40	$(NULL)	44	$(NULL)
41		45
42	# Extra options to supply to gtkdoc-mkdb	46	# Extra options to supply to gtkdoc-mkdb