equal
deleted
inserted
replaced
54 LD_OPTIONS += $(LD_OPTIONS.$(BITS)) |
54 LD_OPTIONS += $(LD_OPTIONS.$(BITS)) |
55 |
55 |
56 # Assumes GNU xgettext in PATH |
56 # Assumes GNU xgettext in PATH |
57 CONFIGURE_ENV += PATH=$(GNUBIN):$(PATH) |
57 CONFIGURE_ENV += PATH=$(GNUBIN):$(PATH) |
58 |
58 |
59 # Delete this when build servers are installed with gsettings-desktop-schemas |
|
60 SCHEMAS_ROOT = $(WS_COMPONENTS)/gnome/gsettings-desktop-schemas/build/prototype/$(MACH) |
|
61 PKG_CONFIG_PATHS += $(SCHEMAS_ROOT)/usr/share/pkgconfig/ |
|
62 CONFIGURE_ENV += GSETTINGS_DESKTOP_SCHEMAS_CFLAGS="-I$(SCHEMAS_ROOT)/usr/include/gsettings-desktop-schemas" |
|
63 |
|
64 # special targets due to dependency on gsettings-desktop-schemas |
|
65 ../gsettings-desktop-schemas/build/%/.installed: |
|
66 (cd ../gsettings-desktop-schemas && $(GMAKE) install) |
|
67 |
|
68 $(CONFIGURE_32): ../gsettings-desktop-schemas/build/$(MACH32)/.installed |
|
69 $(CONFIGURE_64): ../gsettings-desktop-schemas/build/$(MACH64)/.installed |
|
70 # end of Delete |
|
71 |
|
72 CONFIGURE_OPTIONS += --with-ca-certificates=/etc/certs/ca-certificates.crt |
59 CONFIGURE_OPTIONS += --with-ca-certificates=/etc/certs/ca-certificates.crt |
73 CONFIGURE_OPTIONS += --with-pkcs11=no |
60 CONFIGURE_OPTIONS += --with-pkcs11=no |
74 CONFIGURE_OPTIONS += --libexecdir=$(CONFIGURE_LIBDIR.$(BITS)) |
61 CONFIGURE_OPTIONS += --libexecdir=$(CONFIGURE_LIBDIR.$(BITS)) |
75 |
62 |
76 # for the tests |
63 # for the tests |
83 '-e "/SKIP:/p" ' \ |
70 '-e "/SKIP:/p" ' \ |
84 '-e "/PASS:/p" ' \ |
71 '-e "/PASS:/p" ' \ |
85 '-e "/FAIL:/p" ' \ |
72 '-e "/FAIL:/p" ' \ |
86 '-e "/ERROR:/p" ' |
73 '-e "/ERROR:/p" ' |
87 |
74 |
|
75 REQUIRED_PACKAGES += gnome/gsettings-desktop-schemas |
88 REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc |
76 REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc |
89 REQUIRED_PACKAGES += developer/gnome/gettext |
77 REQUIRED_PACKAGES += developer/gnome/gettext |
90 REQUIRED_PACKAGES += library/glib2 |
78 REQUIRED_PACKAGES += library/glib2 |
91 REQUIRED_PACKAGES += library/gnutls-3 |
79 REQUIRED_PACKAGES += library/gnutls-3 |
92 REQUIRED_PACKAGES += library/libproxy |
80 REQUIRED_PACKAGES += library/libproxy |